diff --git a/common/content/liberator.js b/common/content/liberator.js
index 795d89a4..a6c3ec12 100644
--- a/common/content/liberator.js
+++ b/common/content/liberator.js
@@ -1452,8 +1452,8 @@ const liberator = (function () //{{{
             function addTags(file, doc)
             {
                 doc = XSLT.transformToDocument(doc);
-                for (let elem in util.evaluateXPath("//liberator:tag/text()", doc))
-                    tagMap[elem.textContent] = file;
+                for (let elem in util.evaluateXPath("//xhtml:a/@id", doc))
+                    tagMap[elem.value] = file;
             }
 
             const XSLT = XSLTProcessor("chrome://liberator/content/help.xsl");
diff --git a/vimperator/content/config.js b/vimperator/content/config.js
index 6861c2e3..1dbc1cb9 100644
--- a/vimperator/content/config.js
+++ b/vimperator/content/config.js
@@ -197,7 +197,7 @@ const config = { //{{{
             function ()
             {
                 if (!document.getElementById("sidebar-box").hidden)
-                    toggleSidebar();
+                    window.toggleSidebar();
             },
             { argCount: "0" });