Index: /branches/release-34/lib/MT/CMS/Template.pm
===================================================================
--- /branches/release-34/lib/MT/CMS/Template.pm (revision 1873)
+++ /branches/release-34/lib/MT/CMS/Template.pm (revision 1875)
@@ -638,20 +638,16 @@
         @types = ( $template_type );
     }
+    $app->delete_param('filter_key') if $filter;
     foreach my $tmpl_type (@types) {
-        $app->delete_param('filter_key') if $filter;
         if ( $tmpl_type eq 'index' ) {
-            $filter = 'index_templates';
             $app->param( 'filter_key', 'index_templates' );
         }
         elsif ( $tmpl_type eq 'archive' ) {
-            $filter = 'archive_templates';
             $app->param( 'filter_key', 'archive_templates' );
         }
         elsif ( $tmpl_type eq 'system' ) {
-            $filter = 'system_templates';
             $app->param( 'filter_key', 'system_templates' );
         }
         elsif ( $tmpl_type eq 'email' ) {
-            $filter = 'email_templates';
             $app->param( 'filter_key', 'email_templates' );
         }
@@ -672,4 +668,14 @@
         $tmpl_param->{template_type_label} = $template_type_label;
         push @tmpl_loop, $tmpl_param;
+    }
+    if ($filter) {
+        $params->{filter_key} = $filter;
+        $params->{filter_label} = $types{$template_type}{label}
+            if exists $types{$template_type};
+        $app->param('filter_key', $filter);
+    } else {
+        # restore filter_key param (we modified it for the
+        # sake of the individual table listings)
+        $app->delete_param('filter_key');
     }
 
Index: /branches/release-34/tmpl/cms/list_template.tmpl
===================================================================
--- /branches/release-34/tmpl/cms/list_template.tmpl (revision 1770)
+++ /branches/release-34/tmpl/cms/list_template.tmpl (revision 1875)
@@ -46,13 +46,7 @@
         <mt:if name="filter_key">
             <strong><__trans phrase="Showing only: [_1]" params="<mt:var name="filter_label">"></strong>
-            <!-- <a class="filter-link" href="<mt:var name="script_url">?__mode=list&amp;_type=template&amp;blog_id=<mt:var name="blog_id">">[ <__trans phrase="Remove filter"> ]</a> -->
+            <a class="filter-link" href="<mt:var name="script_url">?__mode=list&amp;_type=template<mt:if name="blog_id">&amp;blog_id=<mt:var name="blog_id"></mt:if>">[ <__trans phrase="Remove filter"> ]</a>
         <mt:else>
-            <mt:unless name="filter">
             <strong><__trans phrase="All Templates"></strong>
-            <!-- <a href="javascript:void(0)" onclick="toggleFilter()" class="filter-link">[ <__trans phrase="change"> ]</a> -->
-            <mt:else>
-            <strong><a href="javascript:void(0)" onclick="toggleFilter()"><__trans phrase="[_1] where [_2] is [_3]" params='<$mt:var name="object_label_plural"$>%%<span id="filter-text-col">&nbsp;</span>%%<span id="filter-text-val"></span>'></a></strong>
-            <a href="<mt:var name="script_url">?__mode=<mt:var name="mode"><mt:if name="blog_id">&amp;blog_id=<mt:var name="blog_id"></mt:if><mt:if name="is_power_edit">&amp;is_power_edit=1</mt:if>"><__trans phrase="Remove filter"></a>
-            </mt:unless>
         </mt:if>
         </div>