diff --git a/src/MoleculeRenderer.php b/src/MoleculeRenderer.php
index 6ec038c..bd83ec1 100644
--- a/src/MoleculeRenderer.php
+++ b/src/MoleculeRenderer.php
@@ -51,10 +51,10 @@ class MoleculeRenderer
     {
         // Proxy into Sourire for molecule render.
         $img = Image::make($this->sourireUrl 
-            . 'molecule/' . urlencode($smiles) 
+            . 'molecule/' . rawurlencode($smiles) 
             . '?render-stereo-style=' . ($this->renderChiralLabels ? 'old' : 'none') // Label chiral atoms?
             . '&render-comment-offset=16' // Give some space between label and molecule.
-            . ($this->customLabel === '' ? '' : ('&render-comment=' . urlencode($this->customLabel))));
+            . ($this->customLabel === '' ? '' : ('&render-comment=' . rawurlencode($this->customLabel))));
 
         // Colorize molecule.
         list($r, $g, $b) = sscanf($color, "%02x%02x%02x");
diff --git a/src/SmilesConverter.php b/src/SmilesConverter.php
index 1f8e840..86ff29a 100644
--- a/src/SmilesConverter.php
+++ b/src/SmilesConverter.php
@@ -48,7 +48,7 @@ class SmilesConverter
     public function nameToSmiles($name)
     {
         // Sanitize name for URLs.
-        $encoded = urlencode($name);
+        $encoded = rawurlencode($name);
 
         // Check if we've got the name cached already.
         if ($this->isCacheEnabled()) {
diff --git a/src/coffee/main.coffee b/src/coffee/main.coffee
index 4e2acbb..49d5bdc 100644
--- a/src/coffee/main.coffee
+++ b/src/coffee/main.coffee
@@ -34,7 +34,7 @@ $(document).ready ->
   # Gets the sanitized compound name as entered by the user.
   #
   getCompoundName = ->
-    encodeURIComponent compoundTextBox.val().replace(/\s/g, '')
+    encodeURIComponent compoundTextBox.val()
 
   # Gets the sanitized compound SMILES structure as entered by the user.
   #