diff --git a/common/content/completion.js b/common/content/completion.js
index be606b99..24a20e53 100644
--- a/common/content/completion.js
+++ b/common/content/completion.js
@@ -128,7 +128,7 @@ function CompletionContext(editor, name, offset) //{{{
          *     results.
          */
         this.filters = [function (item) {
-            let text = Array.concat(this.getKey(item, "text"));
+            let text = Array.concat(item.text);
             for (let [i, str] in Iterator(text))
             {
                 if (this.match(String(str)))
diff --git a/common/content/template.js b/common/content/template.js
index 0f7a08a3..0baaaf00 100644
--- a/common/content/template.js
+++ b/common/content/template.js
@@ -49,8 +49,8 @@ const template = {
         }
         else
         {
-            var text = this.process[0].call(this, item, item.text || this.getKey(item, "text"));
-            var desc = this.process[1].call(this, item, this.getKey(item, "description"));
+            var text = this.process[0].call(this, item, item.text);
+            var desc = this.process[1].call(this, item, item.description);
         }
 
         // <e4x>
@@ -66,27 +66,23 @@ const template = {
     },
 
     bookmarkDescription: function (item, text)
-    {
-        let extra = this.getKey(item, "extra");
-        return <>
-            <a href={item.item.url} highlight="URL">{text}</a>&#160;
-            {
-                !(extra && extra.length) ? "" :
-                <span class="extra-info">
-                    ({
-                        template.map(extra, function (e)
-                        <>{e[0]}: <span highlight={e[2]}>{e[1]}</span></>,
-                        <>&#xa0;</>/* Non-breaking space */)
-                    })
-                </span>
-            }
-        </>
-    },
+    <>
+        <a href={item.item.url} highlight="URL">{text}</a>&#160;
+        {
+            !(item.extra && item.extra.length) ? "" :
+            <span class="extra-info">
+                ({
+                    template.map(item.extra, function (e)
+                    <>{e[0]}: <span highlight={e[2]}>{e[1]}</span></>,
+                    <>&#xa0;</>/* Non-breaking space */)
+                })
+            </span>
+        }
+    </> ,
 
     icon: function (item, text)
     {
-        let icon = this.getKey(item, "icon");
-        return <><span highlight="CompIcon">{icon ? <img src={icon}/> : <></>}</span><span class="td-strut"/>{text}</>
+        return <><span highlight="CompIcon">{item.icon ? <img src={item.icon}/> : <></>}</span><span class="td-strut"/>{text}</>
     },
 
     filter: function (str) <span highlight="Filter">{str}</span>,