diff --git a/common/content/history.js b/common/content/history.js
index 980dccb1..b768a02c 100644
--- a/common/content/history.js
+++ b/common/content/history.js
@@ -250,7 +250,7 @@ var History = Module("history", {
             context.generate = function () [
                 Array.slice(row.rev_host).reverse().join("").slice(1)
                 for (row in iter(services.history.DBConnection
-                                         .createStatement("SELECT DISTINCT rev_host FROM moz_places;")))
+                                         .createStatement("SELECT DISTINCT rev_host FROM moz_places WHERE rev_host IS NOT NULL;")))
             ].slice(2);
         };
 
diff --git a/common/modules/sanitizer.jsm b/common/modules/sanitizer.jsm
index 5b6be968..4fe875f9 100644
--- a/common/modules/sanitizer.jsm
+++ b/common/modules/sanitizer.jsm
@@ -434,7 +434,7 @@ var Sanitizer = Module("sanitizer", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakRef
                 bang: true,
                 completer: function (context) {
                     context.title = ["Privacy Item", "Description"];
-                    context.completions = modules.options.get("sanitizeitems").completer();
+                    context.completions = modules.options.get("sanitizeitems").values;
                 },
                 domains: function (args) args["-host"] || [],
                 options: [