diff --git a/common/content/hints.js b/common/content/hints.js
index a06d4f29..0fe7ab4a 100644
--- a/common/content/hints.js
+++ b/common/content/hints.js
@@ -1116,9 +1116,9 @@ const Hints = Module("hints", {
         options.add(["extendedhinttags", "eht"],
             "XPath string of hintable elements activated by ';'",
             "regexpmap", "[iI]:" + xpath(["img"]) +
-                       ",[OTivVWy]:" + xpath(["{a,area}[@href]", "{img,iframe}[@src]"]) +
-                       ",[F]:" + xpath(["div", "span", "p", "body", "html"]) +
-                       ",[S]:" + xpath(["input[not(@type='hidden')]", "textarea", "button", "select"]),
+                        ",[OTivVWy]:" + xpath(["{a,area}[@href]", "{img,iframe}[@src]"]) +
+                        ",[F]:" + xpath(["div", "span", "p", "body", "html"]) +
+                        ",[S]:" + xpath(["input[not(@type='hidden')]", "textarea", "button", "select"]),
             { validator: Option.validateXPath });
 
         options.add(["hinttags", "ht"],
diff --git a/common/modules/storage.jsm b/common/modules/storage.jsm
index fd6432db..5ebe36e5 100644
--- a/common/modules/storage.jsm
+++ b/common/modules/storage.jsm
@@ -19,7 +19,7 @@ const win32 = /^win(32|nt)$/i.test(services.runtime.OS);
 function loadData(name, store, type) {
     try {
         if (storage.infoPath)
-            var file = storage.infoPath.child(name);
+            var file = storage.infoPath.child(name).read();
         if (file)
             var result = services.json.decode(file);
         if (result instanceof type)