Index: branches/5.2.x/core/admin_templates/incs/grid_blocks.tpl
===================================================================
diff -u -N -r16307 -r16339
--- branches/5.2.x/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 16307)
+++ branches/5.2.x/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 16339)
@@ -351,7 +351,7 @@
 		<script type="text/javascript">
 			new AJAXDropDown('<inp2:SearchInputName field="$filter_field" filter_type="like" grid="$grid"/>',
 				function(cur_value) {
-					return '<inp2:m_t no_amp="1" pass="m,{$PrefixSpecial}" field="$filter_field" {$PrefixSpecial}_event="OnSuggestValues" cur_value="#VALUE#"/>'.replace('#VALUE#', cur_value);
+					return '<inp2:m_t pass="m,{$PrefixSpecial}" field="$filter_field" {$PrefixSpecial}_event="OnSuggestValues" cur_value="#VALUE#" no_amp="1" js_escape="1"/>'.replace('#VALUE#', cur_value);
 				}
 			);
 		</script>
@@ -719,7 +719,7 @@
 			<inp2:m_RenderElement name="grid_search_buttons" pass_params="1"/>
 		</inp2:m_ifnot>
 
-		GridScrollers['<inp2:m_param name="PrefixSpecial"/>'].SaveURL = '<inp2:m_t pass="m,$PrefixSpecial" {$PrefixSpecial}_event="OnSaveWidths" widths="#WIDTHS#" no_amp="1" grid_name="$grid"/>';
+		GridScrollers['<inp2:m_param name="PrefixSpecial"/>'].SaveURL = '<inp2:m_t pass="m,$PrefixSpecial" {$PrefixSpecial}_event="OnSaveWidths" widths="#WIDTHS#" grid_name="$grid" no_amp="1" js_escape="1"/>';
 
 		<inp2:m_if check="m_Param" name="selector">
 			// 2. scan grid (only when using selector)