diff --git a/webtools/bugzilla/template/en/default/list/table.html.tmpl b/webtools/bugzilla/template/en/default/list/table.html.tmpl
index 0387adafb92..b025cd14a8c 100644
--- a/webtools/bugzilla/template/en/default/list/table.html.tmpl
+++ b/webtools/bugzilla/template/en/default/list/table.html.tmpl
@@ -63,8 +63,6 @@
   }
 %]
 
-[% qorder = order FILTER url_quote IF order %]
-
 [% PROCESS bug/time.html.tmpl %]
 
 [%############################################################################%]
@@ -94,7 +92,7 @@
           <a href="buglist.cgi?
                     [% urlquerypart FILTER html %]&amp;order=bugs.bug_id
                     [%-#%]&amp;query_based_on=
-                    [% defaultsavename OR searchname FILTER html %]">ID</a>
+                    [% defaultsavename OR searchname FILTER url_quote %]">ID</a>
         [% END %]
       </th>
 
@@ -139,10 +137,10 @@
         [% column.sortalias = column.name %]
       [% END %]
       <a href="buglist.cgi?[% urlquerypart FILTER html %]&amp;order=
-        [% column.sortalias FILTER url_quote FILTER html %]
-        [% ",$qorder" FILTER html IF order %]
+        [% column.sortalias FILTER url_quote %]
+        [% ",$order" FILTER url_quote IF order %]
         [%-#%]&amp;query_based_on=
-        [% defaultsavename OR searchname FILTER html %]">
+        [% defaultsavename OR searchname FILTER url_quote %]">
           [%- abbrev.$id.title || field_descs.$id || column.title -%]</a>
     [% END %]
   </th>