Index: branches/5.1.x/core/admin_templates/incs/grid_blocks.tpl
===================================================================
diff -u -N -r13487 -r13545
--- branches/5.1.x/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 13487)
+++ branches/5.1.x/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 13545)
@@ -52,7 +52,7 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="search_main_toolbar">
-	<td style="white-space: nowrap; text-align: right; width: 260px;" align="right">
+	<td style="white-space: nowrap; text-align: right; width: 310px;" align="right">
 		<div style="float: right">
 			<table cellpadding="0" cellspacing="0">
 				<tr>
@@ -64,7 +64,7 @@
 							value="<inp2:m_recall var='{$prefix}_search_keyword' no_null='no_null' special='1'/>"
 							PrefixSpecial="<inp2:m_param name='prefix'/>"
 							Grid="<inp2:m_param name='grid'/>"
-							ajax="0" style="width:160px"/>
+							ajax="0" style="width:150px"/>
 					</td>
 					<td style="white-space: nowrap;">
 						<script type="text/javascript">
@@ -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"
@@ -673,7 +677,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"
@@ -703,7 +707,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"/>];