diff --git a/common/content/bookmarks.js b/common/content/bookmarks.js
index ef095782..3e87b283 100644
--- a/common/content/bookmarks.js
+++ b/common/content/bookmarks.js
@@ -210,10 +210,10 @@ var Bookmarks = Module("bookmarks", {
     get searchEngines() {
         let searchEngines = [];
         let aliases = {};
-        return array(services.browserSearch.getVisibleEngines({})).map(function (engine) {
+        return iter(services.browserSearch.getVisibleEngines({})).map(function ([, engine]) {
             let alias = engine.alias;
-            if (!alias || !/^[a-z_-]+$/.test(alias))
-                alias = engine.name.replace(/^\W*([a-zA-Z\s_-]+).*/, "$1").replace(/\s+/g, "-").toLowerCase();
+            if (!alias || !/^[a-z-]+$/.test(alias))
+                alias = engine.name.replace(/[a-z_-]+/i, "-").replace(/^-|-$/, "").toLowerCase();
             if (!alias)
                 alias = "search"; // for search engines which we can't find a suitable alias
 
diff --git a/common/modules/highlight.jsm b/common/modules/highlight.jsm
index e982d09e..d165b664 100644
--- a/common/modules/highlight.jsm
+++ b/common/modules/highlight.jsm
@@ -116,6 +116,9 @@ var Highlights = Module("Highlight", {
 
         if (/^[[>+: ]/.test(args[1]))
             obj.selector = this.selector(obj.class) + args[1];
+        else if (args[1])
+            obj.selector = this.selector(args[1]);
+
         if (old && old.value != old.defaultValue)
             obj.value = old.value;
 
diff --git a/common/modules/prefs.jsm b/common/modules/prefs.jsm
index 9e8128ed..04a131b3 100644
--- a/common/modules/prefs.jsm
+++ b/common/modules/prefs.jsm
@@ -27,11 +27,11 @@ var Prefs = Module("prefs", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
         if (this.branch instanceof Ci.nsIPrefBranch2)
             this.branch.QueryInterface(Ci.nsIPrefBranch2);
 
+        this.defaults = defaults ? this : this.constructor(branch, true);
+
         if (!defaults)
             this.restore();
 
-        this.defaults = defaults ? this : this.constructor(branch, true);
-
         this._observers = {};
     },