diff --git a/common/content/buffer.js b/common/content/buffer.js
index faf04574..ca0013f4 100644
--- a/common/content/buffer.js
+++ b/common/content/buffer.js
@@ -555,7 +555,7 @@ const Buffer = Module("buffer", {
                 return true;
             }
 
-            let res = util.evaluateXPath(options.get("hinttags").defaultValue, frame.document);
+            let res = util.evaluateXPath(options.get("hinttags").defaultValues, frame.document);
             for (let [, regex] in Iterator(regexes)) {
                 for (let i in util.range(res.snapshotLength, 0, -1)) {
                     let elem = res.snapshotItem(i);
diff --git a/common/content/options.js b/common/content/options.js
index ae8c2605..09ee0d31 100644
--- a/common/content/options.js
+++ b/common/content/options.js
@@ -53,7 +53,8 @@ const Option = Class("Option", {
         if (arguments.length > 3) {
             if (this.type == "string")
                 defaultValue = Commands.quote(defaultValue);
-            this.defaultValue = this.joinValues(this.parseValues(defaultValue));
+            this.defaultValues = this.parseValues(defaultValue)
+            this.defaultValue = this.joinValues(this.defaultValues);
         }
 
         if (extraInfo)
@@ -1291,7 +1292,7 @@ const Options = Module("options", {
                                                                : opt.name + "=" + opt.value]
                         }
                         for (opt in options)
-                        if (!opt.getter && opt.value != opt.defaultValue && (opt.scope & Option.SCOPE_GLOBAL))
+                        if (!opt.getter && opt.value !== opt.defaultValue && (opt.scope & Option.SCOPE_GLOBAL))
                     ]
                 }
             }