Index: branches/5.0.x/core/admin_templates/users/admins_list.tpl
===================================================================
diff -u -r12506 -r13256
--- branches/5.0.x/core/admin_templates/users/admins_list.tpl	(.../admins_list.tpl)	(revision 12506)
+++ branches/5.0.x/core/admin_templates/users/admins_list.tpl	(.../admins_list.tpl)	(revision 13256)
@@ -61,7 +61,7 @@
 </tbody>
 </table>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="u.admins" IdField="PortalUserId" grid="Admins" menu_filters="yes" grid_filters="1"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="u.admins" IdField="PortalUserId" grid="Admins" menu_filters="yes"/>
 <script type="text/javascript">
 	Grids['u.admins'].SetDependantToolbarButtons( new Array('edit','delete','clone') );
 </script>
Index: branches/5.0.x/core/admin_templates/users/users_list.tpl
===================================================================
diff -u -r12511 -r13256
--- branches/5.0.x/core/admin_templates/users/users_list.tpl	(.../users_list.tpl)	(revision 12511)
+++ branches/5.0.x/core/admin_templates/users/users_list.tpl	(.../users_list.tpl)	(revision 13256)
@@ -101,7 +101,7 @@
 </tbody>
 </table>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="u.regular" IdField="PortalUserId" grid="RegularUsers" menu_filters="yes" grid_filters="1"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="u.regular" IdField="PortalUserId" grid="RegularUsers" menu_filters="yes"/>
 <script type="text/javascript">
 	Grids['u.regular'].SetDependantToolbarButtons( new Array('edit', 'delete', 'e-mail', 'approve', 'decline') );
 </script>
Index: branches/5.0.x/core/admin_templates/skins/skin_list.tpl
===================================================================
diff -u -r12506 -r13256
--- branches/5.0.x/core/admin_templates/skins/skin_list.tpl	(.../skin_list.tpl)	(revision 12506)
+++ branches/5.0.x/core/admin_templates/skins/skin_list.tpl	(.../skin_list.tpl)	(revision 13256)
@@ -64,7 +64,7 @@
 </tbody>
 </table>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="skin" IdField="SkinId" grid="Default" grid_filters="1"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="skin" IdField="SkinId" grid="Default"/>
 <script type="text/javascript">
 	Grids['skin'].SetDependantToolbarButtons( new Array('edit', 'delete', 'setprimary', 'clone') );
 </script>
Index: branches/5.0.x/core/admin_templates/agents/agent_list.tpl
===================================================================
diff -u -r12495 -r13256
--- branches/5.0.x/core/admin_templates/agents/agent_list.tpl	(.../agent_list.tpl)	(revision 12495)
+++ branches/5.0.x/core/admin_templates/agents/agent_list.tpl	(.../agent_list.tpl)	(revision 13256)
@@ -72,7 +72,7 @@
 </tbody>
 </table>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="agent" IdField="AgentId" grid="Default" grid_filters="1"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="agent" IdField="AgentId" grid="Default"/>
 <script type="text/javascript">
 	Grids['agent'].SetDependantToolbarButtons( new Array('edit','delete', 'approve', 'decline', 'cancel') );
 </script>
Index: branches/5.0.x/core/admin_templates/ban_rules/ban_rule_list.tpl
===================================================================
diff -u -r12495 -r13256
--- branches/5.0.x/core/admin_templates/ban_rules/ban_rule_list.tpl	(.../ban_rule_list.tpl)	(revision 12495)
+++ branches/5.0.x/core/admin_templates/ban_rules/ban_rule_list.tpl	(.../ban_rule_list.tpl)	(revision 13256)
@@ -63,7 +63,7 @@
 </tbody>
 </table>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="ban-rule" IdField="RuleId" grid="Default" grid_filters="1"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="ban-rule" IdField="RuleId" grid="Default"/>
 <script type="text/javascript">
 	Grids['ban-rule'].SetDependantToolbarButtons( new Array('edit', 'delete', 'approve', 'decline') );
 </script>
Index: branches/5.0.x/core/admin_templates/stop_words/stop_word_list.tpl
===================================================================
diff -u -r12495 -r13256
--- branches/5.0.x/core/admin_templates/stop_words/stop_word_list.tpl	(.../stop_word_list.tpl)	(revision 12495)
+++ branches/5.0.x/core/admin_templates/stop_words/stop_word_list.tpl	(.../stop_word_list.tpl)	(revision 13256)
@@ -41,7 +41,7 @@
 </tbody>
 </table>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="stop-word" IdField="StopWordId" grid="Default" grid_filters="1"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="stop-word" IdField="StopWordId" grid="Default"/>
 <script type="text/javascript">
 	Grids['stop-word'].SetDependantToolbarButtons( new Array('edit','delete') );
 </script>
Index: branches/5.0.x/core/admin_templates/incs/grid_blocks.tpl
===================================================================
diff -u -r13230 -r13256
--- branches/5.0.x/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 13230)
+++ branches/5.0.x/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 13256)
@@ -585,6 +585,10 @@
 	'<inp2:m_RenderElement name="$data_block" pass_params="1" js_escape="1"/>'<inp2:m_if check="m_Param" name="is_last" inverse="1">,</inp2:m_if>
 </inp2:m_DefineElement>
 
+<inp2:m_DefineElement name="grid_js_empty_filter_block" use_phrases="0">
+	'<inp2:m_RenderElement name="grid_empty_filter" pass_params="1" js_escape="1"/>'<inp2:m_if check="m_Param" name="is_last" inverse="1">,</inp2:m_if>
+</inp2:m_DefineElement>
+
 <inp2:m_DefineElement name="grid_js_filter_block" use_phrases="0">
 	'<inp2:m_RenderElement name="$filter_block" pass_params="1" js_escape="1"/>'<inp2:m_if check="m_Param" name="is_last" inverse="1">,</inp2:m_if>
 </inp2:m_DefineElement>
@@ -593,7 +597,7 @@
 	<inp2:m_Param name="width" js_escape="1"/><inp2:m_if check="m_Param" name="is_last" inverse="1">,</inp2:m_if>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="grid" main_prefix="" per_page="" main_special="" grid_filters=""
+<inp2:m_DefineElement name="grid" main_prefix="" per_page="" main_special="" grid_filters="1"
 	 search="on"
 	 header_block="grid_column_title"
 	 filter_block="grid_column_filter"
@@ -674,7 +678,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="grid_js"
-	main_prefix="" per_page="" main_special="" grid_filters=""
+	main_prefix="" per_page="" main_special="" grid_filters="1"
 	header_block="grid_column_title"
 	filter_block="grid_column_filter"
 	data_block="grid_data_td"
@@ -704,7 +708,13 @@
 		GridScrollers['<inp2:m_param name="PrefixSpecial"/>'].SetHeader(
 			[
 				[' <inp2:m_RenderElement name="default_sorting_element" prefix="$PrefixSpecial" ajax="$ajax" js_escape="1" strip_nl="2"/>', <inp2:IterateGridFields grid="$grid" mode="header" block="$header_block" ajax="$ajax"/>],
-				['<inp2:m_if check="m_Param" name="selector" equals_to="checkbox"><inp2:m_RenderElement name="grid_select_all_checkbox_html" pass_params="1" js_escape="1"/><inp2:m_else/>&nbsp;</inp2:m_if>', <inp2:IterateGridFields grid="$grid" mode="filter" force_block="grid_js_filter_block" ajax="$ajax"/>]
+				['<inp2:m_if check="m_Param" name="selector" equals_to="checkbox"><inp2:m_RenderElement name="grid_select_all_checkbox_html" pass_params="1" js_escape="1"/><inp2:m_else/>&nbsp;</inp2:m_if>',
+					<inp2:m_if check="m_Param" name="grid_filters">
+						<inp2:IterateGridFields grid="$grid" mode="filter" force_block="grid_js_filter_block" ajax="$ajax"/>
+					<inp2:m_else/>
+						<inp2:IterateGridFields grid="$grid" mode="filter" force_block="grid_js_empty_filter_block" ajax="$ajax"/>
+					</inp2:m_if>
+				]
 			]
 		)
 		GridScrollers['<inp2:m_param name="PrefixSpecial"/>'].FieldNames = ['_CheckboxColumn', <inp2:IterateGridFields grid="$grid" mode="fields"/>];
Index: branches/5.0.x/core/admin_templates/mailing_lists/mailing_list_list.tpl
===================================================================
diff -u -r12117 -r13256
--- branches/5.0.x/core/admin_templates/mailing_lists/mailing_list_list.tpl	(.../mailing_list_list.tpl)	(revision 12117)
+++ branches/5.0.x/core/admin_templates/mailing_lists/mailing_list_list.tpl	(.../mailing_list_list.tpl)	(revision 13256)
@@ -72,7 +72,7 @@
 </tbody>
 </table>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="mailing-list" IdField="MailingId" grid="Default" grid_filters="1"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="mailing-list" IdField="MailingId" grid="Default"/>
 <script type="text/javascript">
 	Grids['mailing-list'].SetDependantToolbarButtons( new Array('view_item', 'delete', 'cancel') );
 </script>
Index: branches/5.0.x/core/admin_templates/logs/change_logs/change_log_list.tpl
===================================================================
diff -u -r12714 -r13256
--- branches/5.0.x/core/admin_templates/logs/change_logs/change_log_list.tpl	(.../change_log_list.tpl)	(revision 12714)
+++ branches/5.0.x/core/admin_templates/logs/change_logs/change_log_list.tpl	(.../change_log_list.tpl)	(revision 13256)
@@ -71,7 +71,7 @@
 	<inp2:Field field="$field" first_chars="$first_chars" nl2br="$nl2br" grid="$grid" no_special="1" format="$format"/>
 </inp2:m_DefineElement>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="change-log" IdField="ChangeLogId" grid="Default" grid_filters="1" row_class_render_as="row_class"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="change-log" IdField="ChangeLogId" grid="Default" row_class_render_as="row_class"/>
 <script type="text/javascript">
 	Grids['change-log'].SetDependantToolbarButtons( new Array('edit') );
 </script>
Index: branches/5.0.x/core/admin_templates/logs/visits/visits_list.tpl
===================================================================
diff -u -r12495 -r13256
--- branches/5.0.x/core/admin_templates/logs/visits/visits_list.tpl	(.../visits_list.tpl)	(revision 12495)
+++ branches/5.0.x/core/admin_templates/logs/visits/visits_list.tpl	(.../visits_list.tpl)	(revision 13256)
@@ -64,7 +64,7 @@
 	</div>
 </inp2:m_DefineElement>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="visits" IdField="VisitId" grid="Default" grid_filters="1"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="visits" IdField="VisitId" grid="Default"/>
 <script type="text/javascript">
 	Grids['visits'].SetDependantToolbarButtons( new Array('delete') );
 </script>
Index: branches/5.0.x/core/admin_templates/thesaurus/thesaurus_list.tpl
===================================================================
diff -u -r12495 -r13256
--- branches/5.0.x/core/admin_templates/thesaurus/thesaurus_list.tpl	(.../thesaurus_list.tpl)	(revision 12495)
+++ branches/5.0.x/core/admin_templates/thesaurus/thesaurus_list.tpl	(.../thesaurus_list.tpl)	(revision 13256)
@@ -47,7 +47,7 @@
 </tbody>
 </table>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="thesaurus" IdField="ThesaurusId" grid="Default" grid_filters="1"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="thesaurus" IdField="ThesaurusId" grid="Default"/>
 <script type="text/javascript">
 	Grids['thesaurus'].SetDependantToolbarButtons( new Array('edit','delete') );
 </script>
Index: branches/5.0.x/core/admin_templates/logs/session_logs/session_log_list.tpl
===================================================================
diff -u -r12714 -r13256
--- branches/5.0.x/core/admin_templates/logs/session_logs/session_log_list.tpl	(.../session_log_list.tpl)	(revision 12714)
+++ branches/5.0.x/core/admin_templates/logs/session_logs/session_log_list.tpl	(.../session_log_list.tpl)	(revision 13256)
@@ -58,7 +58,7 @@
 	<a href="<inp2:m_t t="logs/change_logs/change_log_list" pass="m,change-log" grid_name="Default" custom_filters[change-log][Default][SessionLogId][like]="$sessionlog_id" change-log_event="OnSearch"/>"><inp2:Field name="AffectedItems"/></a>
 </inp2:m_DefineElement>
 
-<inp2:m_RenderElement name="grid" PrefixSpecial="session-log" IdField="SessionLogId" grid="Default" grid_filters="1" row_class_render_as="row_class"/>
+<inp2:m_RenderElement name="grid" PrefixSpecial="session-log" IdField="SessionLogId" grid="Default" row_class_render_as="row_class"/>
 <script type="text/javascript">
 	Grids['session-log'].SetDependantToolbarButtons( new Array() );
 </script>