diff --git a/common/content/bookmarks.js b/common/content/bookmarks.js
index 7fe61ab0..8b741d9a 100644
--- a/common/content/bookmarks.js
+++ b/common/content/bookmarks.js
@@ -105,7 +105,7 @@ var Bookmarks = Module("bookmarks", {
      */
     addSearchKeyword: function (elem) {
         if (elem instanceof HTMLFormElement || elem.form)
-            var [url, post,, charset] = util.parseForm(elem);
+            var [url, post, charset] = util.parseForm(elem);
         else
             var [url, post, charset] = [elem.href || elem.src, null, elem.ownerDocument.characterSet];
 
diff --git a/common/modules/util.jsm b/common/modules/util.jsm
index 7ee979c8..5e76467e 100644
--- a/common/modules/util.jsm
+++ b/common/modules/util.jsm
@@ -1179,7 +1179,7 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
             }
         }
         if (post)
-            return [url, elems.join('&'), elems, charset];
+            return [url, elems.join('&'), charset, elems];
         return [url + "?" + elems.join('&'), null, charset];
     },