diff --git a/content/completion.js b/content/completion.js
index 22438373..f8f9d497 100644
--- a/content/completion.js
+++ b/content/completion.js
@@ -391,7 +391,11 @@ vimperator.Completion = function () //{{{
                 }
 
                 for (var i = 0; i < prefArray.length; i++)
-                    optionCompletions.push([prefArray[i], vimperator.options.getFirefoxPref(prefArray[i])]);
+                    if (!filter)
+                        optionCompletions.push([prefArray[i], vimperator.options.getFirefoxPref(prefArray[i])]);
+                    else
+                        optionCompletions.push([[prefArray[i]], vimperator.options.getFirefoxPref(prefArray[i])]);
+                        
 
                 if (!filter)
                     return [0, optionCompletions];
diff --git a/content/options.js b/content/options.js
index 417bf573..5c9959e0 100644
--- a/content/options.js
+++ b/content/options.js
@@ -394,7 +394,7 @@ vimperator.Options = function () //{{{
                     defaultValue = loadPreference(name, null, defaultBranch);
 
                     if (defaultValue == null)
-                        defaultValue = "new preference";
+                        defaultValue = "no default";
                     else
                         defaultValue = "default: " + defaultValue;