diff --git a/common/content/bookmarks.js b/common/content/bookmarks.js
index ca1bdb00..ab0ab38c 100644
--- a/common/content/bookmarks.js
+++ b/common/content/bookmarks.js
@@ -347,9 +347,10 @@ var Bookmarks = Module("bookmarks", {
             if (charset)
                 var encodedParam = escape(window.convertFromUnicode(charset, param));
             else
-                encodedParam = bookmarkcache.keywords[keyword].encodeURIComponent(param);
+                encodedParam = bookmarkcache.keywords[keyword.toLowerCase()].encodeURIComponent(param);
 
-            url = url.replace(/%s/g, encodedParam).replace(/%S/g, param);
+            url = url.replace(/%s/g, function () encodedParam)
+                     .replace(/%S/g, function () param);
             if (/%s/i.test(data))
                 postData = window.getPostDataStream(data, param, encodedParam, "application/x-www-form-urlencoded");
         }
diff --git a/common/content/editor.js b/common/content/editor.js
index 262391ec..a91977de 100644
--- a/common/content/editor.js
+++ b/common/content/editor.js
@@ -280,7 +280,7 @@ var Editor = Module("editor", XPCOM(Ci.nsIEditActionListener, ModuleBase), {
         }
     },
 
-    findChar: function findNumber(key, count, backward, offset) {
+    findChar: function findChar(key, count, backward, offset) {
         count  = count || 1; // XXX ?
         offset = (offset || 0) - !!backward;