diff --git a/webtools/addons/lib/addon.class.php b/webtools/addons/lib/addon.class.php
index 86d573f1e9b..d56da5dbc2b 100644
--- a/webtools/addons/lib/addon.class.php
+++ b/webtools/addons/lib/addon.class.php
@@ -250,7 +250,6 @@ class AddOn extends AMO_Object
         // Gather addon categories.
         $this->db->query("
             SELECT DISTINCT
-                categories.CatID,
                 categories.CatName
             FROM
                 categoryxref
@@ -262,7 +261,7 @@ class AddOn extends AMO_Object
                 categories.CatName
         ", SQL_ALL, SQL_ASSOC);
 
-        $this->AddonCats = $this->db->record;
+        $this->setVar('AddonCats',$this->db->record);
     }
 }
 ?>
diff --git a/webtools/addons/tpl/addon.tpl b/webtools/addons/tpl/addon.tpl
index fb22ee95b11..2b6e17f16c1 100644
--- a/webtools/addons/tpl/addon.tpl
+++ b/webtools/addons/tpl/addon.tpl
@@ -1,6 +1,6 @@
 <h2><strong>{$addon->Name}</strong> &raquo; Overview</h2>
 
-<script language="Javascript" type="text/javascript" src="/js/auto.js"></script>
+<script type="text/javascript" src="/js/auto.js"></script>
 
 <p class="first">
 <strong><a href="./addon.php?id={$addon->ID}">{$addon->Name} {$addon->Version}</a></strong>,
@@ -48,8 +48,8 @@ Requires: {$addon->AppName} 1.0 - 1.0+ <img src="{$config.webpath}/img/{$addon->
 <ul>
 <li>Categories: 
 <ul>
-{section name=cats loop=$addon->Cats}
-<li><a href="./search.php?cat={$addon->Cats[cats].CatName}" title="See other Addons in this category.">{$addon->Cats[cats].CatName}</a></li>
+{section name=cats loop=$addon->AddonCats}
+<li><a href="./search.php?cat={$addon->AddonCats[cats].CatName}" title="See other Addons in this category.">{$addon->AddonCats[cats].CatName}</a></li>
 {/section}
 </ul>
 </li>
diff --git a/webtools/addons/tpl/author.tpl b/webtools/addons/tpl/author.tpl
index 593ef251733..04531ff7873 100644
--- a/webtools/addons/tpl/author.tpl
+++ b/webtools/addons/tpl/author.tpl
@@ -5,7 +5,7 @@
 
 <dt>Email</dt>
 <dd>
-{if $user->UserEmailHide}
+{if $user->UserEmailHide eq 1}
 Email not disclosed
 {else}
 <a href="mailt:{$user->UserEmail|escape}">{$user->UserEmail|escape}</a>
diff --git a/webtools/addons/tpl/inc/header.tpl b/webtools/addons/tpl/inc/header.tpl
index 9cc37e65de2..eda4b73edb9 100644
--- a/webtools/addons/tpl/inc/header.tpl
+++ b/webtools/addons/tpl/inc/header.tpl
@@ -37,7 +37,7 @@
     <form id="search" method="get" action="{$config.webpath}/search.php" title="Search Mozilla Update">
     <div>
         <input type="text" id="q" name="q" accesskey="s" size="10" value="{$clean.q}">
-        <input type="submit" id="submit" value="Search">
+        <input type="submit" id="submit" value="Search Addons">
     </div>
     </form>
     <div class="ie-clear-menu">&nbsp;</div>