diff --git a/common/content/buffer.js b/common/content/buffer.js
index d0c732cd..d1577935 100644
--- a/common/content/buffer.js
+++ b/common/content/buffer.js
@@ -1627,7 +1627,7 @@ var Buffer = Module("buffer", {
                             return {
                                 text: [i + ": " + (tab.label || /*L*/"(Untitled)"), i + ": " + url],
                                 tab: tab,
-                                id: i - 1,
+                                id: i,
                                 url: url,
                                 icon: tab.image || DEFAULT_FAVICON
                             };
diff --git a/common/content/tabs.js b/common/content/tabs.js
index c6210807..2aeae8b7 100644
--- a/common/content/tabs.js
+++ b/common/content/tabs.js
@@ -32,7 +32,7 @@ var Tabs = Module("tabs", {
                                           false, true);
 
         dactyl.commands["tabs.select"] = function (event) {
-            tabs.select(event.originalTarget.getAttribute("identifier"));
+            tabs.switchTo(event.originalTarget.getAttribute("identifier"));
         };
 
         this.tabBinding = styles.system.add("tab-binding", "chrome://browser/content/browser.xul", String.replace(<><![CDATA[
diff --git a/common/modules/template.jsm b/common/modules/template.jsm
index 6e18dc50..9cd617c6 100644
--- a/common/modules/template.jsm
+++ b/common/modules/template.jsm
@@ -171,7 +171,7 @@ var Template = Module("Template", {
                     <>&#xa0;</>)
                 })&#xa0;</span>
         }
-        <a xmlns:dactyl={NS} identifier={item.id || ""} dactyl:command={item.command || ""}
+        <a xmlns:dactyl={NS} identifier={item.id == null ? "" : item.id} dactyl:command={item.command || ""}
            href={item.item.url} highlight="URL">{text || ""}</a>
     </>,