diff --git a/common/content/completion.js b/common/content/completion.js
index 4d4c5946..4e6f308d 100644
--- a/common/content/completion.js
+++ b/common/content/completion.js
@@ -1493,7 +1493,7 @@ function Completion() //{{{
                 context.fork("keyword/" + keyword, keyword.length + space.length, null, function (context) {
                     context.format = history.format;
                     context.title = [keyword + " Quick Search"];
-                    context.background = true;
+                    // context.background = true;
                     context.compare = null;
                     context.generate = function () {
                         let [begin, end] = item.url.split("%s");
diff --git a/common/content/modes.js b/common/content/modes.js
index c3a74c1b..203d6198 100644
--- a/common/content/modes.js
+++ b/common/content/modes.js
@@ -74,9 +74,6 @@ const modes = (function () //{{{
     // for its cleanup here
     function handleModeChange(oldMode, newMode)
     {
-        // TODO: fix v.log() to work with verbosity level
-        //liberator.log("switching from mode " + oldMode + " to mode " + newMode, 7);
-        //liberator.dump("switching from mode " + oldMode + " to mode " + newMode + "\n");
 
         switch (oldMode)
         {
@@ -220,7 +217,6 @@ const modes = (function () //{{{
         reset: function (silent)
         {
             modeStack = [];
-            liberator.dump("reset");
             if (config.isComposeWindow)
                 this.set(modes.COMPOSE, modes.NONE, silent);
             else
diff --git a/common/content/ui.js b/common/content/ui.js
index c34783f1..a14b48c2 100644
--- a/common/content/ui.js
+++ b/common/content/ui.js
@@ -1095,8 +1095,7 @@ function CommandLine() //{{{
                     event.preventDefault();
                     event.stopPropagation();
 
-                    // tabTimer.tell(event);
-                    completions.tab(event.shiftKey);
+                    tabTimer.tell(event);
                     return false;
                 }
                 else if (key == "<BS>")
@@ -1118,6 +1117,11 @@ function CommandLine() //{{{
                 }
                 return true; // allow this event to be handled by Firefox
             }
+            else if (event.type == "keyup")
+            {
+                if (key == "<Tab>" || key == "<S-Tab>")
+                    tabTimer.flush();
+            }
         },
 
         onMultilineInputEvent: function onMultilineInputEvent(event)