diff --git a/ChangeLog b/ChangeLog
index 4d5253e5..21851056 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@ date:
 	* version 0.4
 	* extension GUID was changed to 'vimperator@mozdev.net' -> YOU WILL HAVE
 	  TO UNINSTALL ANY OLD VIMPERATOR INSTALLATION BEFORE INSTALLING THIS VERSION
+	* support for internal search engines was dropped. Now we use Firefox
+	  search engines. Add custom search engines with :qsadd, remove engines with :qsdel
 	* support for 'wildmode' completion setting with support for matching the
 	  longest common substring. Also new 'wildoptions' setting
 	* added 'f' to the 'complete' option to allow listing of filenames in :open prompt
diff --git a/chrome/content/vimperator/commands.js b/chrome/content/vimperator/commands.js
index b1d6de86..1f9748bf 100644
--- a/chrome/content/vimperator/commands.js
+++ b/chrome/content/vimperator/commands.js
@@ -1331,9 +1331,13 @@ function stringToURLs(str)
 
         /* if the string contains a space or does not contain any of: .:/
          * open it with default search engine */
-        var default_engine = search_service.defaultEngine;
-        if (default_engine)
-            urls[url] = default_engine.getSubmission(urls[url], null).uri.spec;
+        if (urls[url].match(/\s+/) || urls[url].match(/\.|:|\//) == null)
+        {
+            var default_engine = search_service.defaultEngine;
+            if (default_engine)
+                urls[url] = default_engine.getSubmission(urls[url], null).uri.spec;
+            continue;
+        }
 
 
         // check for ./ and ../ (or even .../) to go to a file in the upper directory