diff --git a/webtools/bugzilla/template/en/default/account/prefs/prefs.html.tmpl b/webtools/bugzilla/template/en/default/account/prefs/prefs.html.tmpl
index 5287ff1e4fa4..e849a4e99121 100644
--- a/webtools/bugzilla/template/en/default/account/prefs/prefs.html.tmpl
+++ b/webtools/bugzilla/template/en/default/account/prefs/prefs.html.tmpl
@@ -53,7 +53,7 @@
 
 [% FOREACH tab IN tabs %]
   [% IF tab.name == current_tab_name %]
-    [% current_tab=tab %]
+    [% current_tab = tab %]
     [% LAST %]
   [% END %]
 [% END %]
diff --git a/webtools/bugzilla/template/en/default/filterexceptions.pl b/webtools/bugzilla/template/en/default/filterexceptions.pl
index cf98ea8e2dbe..3b765ddd49c2 100644
--- a/webtools/bugzilla/template/en/default/filterexceptions.pl
+++ b/webtools/bugzilla/template/en/default/filterexceptions.pl
@@ -90,11 +90,6 @@
   'status.name',
 ],
 
-'search/tabs.html.tmpl' => [
-  'tab.name',
-  'tab.description',
-],
-
 'request/queue.html.tmpl' => [
   'column_headers.$group_field', 
   'column_headers.$column', 
@@ -655,10 +650,8 @@
 ],
 
 'account/prefs/prefs.html.tmpl' => [
-  'tab.name', 
-  'tab.description', 
-  'current_tab.name', 
-  'current_tab.description', 
+  'current_tab.label',
+  'current_tab.name',
 ],
 
 'account/prefs/settings.html.tmpl' => [
diff --git a/webtools/bugzilla/template/en/default/global/tabs.html.tmpl b/webtools/bugzilla/template/en/default/global/tabs.html.tmpl
index a5140bd0da5f..6f8601b86458 100644
--- a/webtools/bugzilla/template/en/default/global/tabs.html.tmpl
+++ b/webtools/bugzilla/template/en/default/global/tabs.html.tmpl
@@ -35,9 +35,9 @@
 
       [% FOREACH tab = tabs %]
         [% IF tab.name == current_tab_name %]
-          <td class="tab selected">[% tab.label %]</td>
+          <td class="tab selected">[% tab.label FILTER html %]</td>
         [% ELSE %]
-          <td class="tab"><a href="[% tab.link %]">[% tab.label %]</a></td>
+          <td class="tab"><a href="[% tab.link FILTER html %]">[% tab.label FILTER html %]</a></td>
         [% END %]
       [% END %]