diff --git a/common/content/bookmarks.js b/common/content/bookmarks.js
index f185154a..9bec779b 100644
--- a/common/content/bookmarks.js
+++ b/common/content/bookmarks.js
@@ -212,7 +212,7 @@ var Bookmarks = Module("bookmarks", {
         return iter(services.browserSearch.getVisibleEngines({})).map(function ([, engine]) {
             let alias = engine.alias;
             if (!alias || !/^[a-z-]+$/.test(alias))
-                alias = engine.name.replace(/^[a-z_-]+/gi, "-").replace(/^-|-$/, "").toLowerCase();
+                alias = engine.name.replace(/[^a-z_-]+/gi, "-").replace(/^-|-$/, "").toLowerCase();
             if (!alias)
                 alias = "search"; // for search engines which we can't find a suitable alias
 
@@ -248,7 +248,7 @@ var Bookmarks = Module("bookmarks", {
         if (engine && engine.supportsResponseType(responseType))
             var queryURI = engine.getSubmission(query, responseType).uri.spec;
         if (!queryURI)
-            return [];
+            return (callback || util.identity)([]);
 
         function process(resp) {
             let results = [];