Index: branches/5.2.x/admin_templates/user_order_item_tab.tpl
===================================================================
diff -u -N -r16059 -r16612
--- branches/5.2.x/admin_templates/user_order_item_tab.tpl	(.../user_order_item_tab.tpl)	(revision 16059)
+++ branches/5.2.x/admin_templates/user_order_item_tab.tpl	(.../user_order_item_tab.tpl)	(revision 16612)
@@ -17,7 +17,7 @@
 		<inp2:$prefix_InitList grid="$grid_name"/>
 
 		$Catalog.setItemCount('<inp2:m_param name="prefix"/>', '<inp2:{$prefix}_TotalRecords/>');
-		$Catalog.setCurrentCategory('<inp2:m_param name="prefix"/>', <inp2:m_get name="m_cat_id" no_html_escape="1" js_escape="1"/>);
+		$Catalog.setCurrentCategory('<inp2:m_param name="prefix"/>', <inp2:m_get name="m_cat_id" js_escape="1"/>);
 		$Catalog.saveSearch('<inp2:m_Param name="prefix"/>', '<inp2:$prefix_SearchKeyword js_escape="1"/>', '<inp2:m_Param name="grid_name"/>');
 
 		<inp2:m_RenderElement name="grid_js" PrefixSpecial="$prefix" IdField="OrderId" grid="$grid_name"/>
Index: branches/5.2.x/admin_templates/user_item_tab.tpl
===================================================================
diff -u -N -r16059 -r16612
--- branches/5.2.x/admin_templates/user_item_tab.tpl	(.../user_item_tab.tpl)	(revision 16059)
+++ branches/5.2.x/admin_templates/user_item_tab.tpl	(.../user_item_tab.tpl)	(revision 16612)
@@ -16,7 +16,7 @@
 		<inp2:$prefix_InitList grid="$grid_name"/>
 
 		$Catalog.setItemCount('<inp2:m_param name="prefix"/>', '<inp2:{$prefix}_CatalogItemCount/>');
-		$Catalog.setCurrentCategory('<inp2:m_param name="prefix"/>', <inp2:m_get name="m_cat_id" no_html_escape="1" js_escape="1"/>);
+		$Catalog.setCurrentCategory('<inp2:m_param name="prefix"/>', <inp2:m_get name="m_cat_id" js_escape="1"/>);
 		$Catalog.saveSearch('<inp2:m_Param name="prefix"/>', '<inp2:$prefix_SearchKeyword js_escape="1"/>', '<inp2:m_Param name="grid_name"/>');
 
 		<inp2:m_DefineElement name="qty_td">
Index: branches/5.2.x/admin_templates/products/products_pricing_grid.tpl
===================================================================
diff -u -N -r16059 -r16612
--- branches/5.2.x/admin_templates/products/products_pricing_grid.tpl	(.../products_pricing_grid.tpl)	(revision 16059)
+++ branches/5.2.x/admin_templates/products/products_pricing_grid.tpl	(.../products_pricing_grid.tpl)	(revision 16612)
@@ -5,8 +5,8 @@
 <inp2:m_else/>
 	<inp2:lang.current_SetContentType content_type="text/plain"/>
 	if ($request_visible) {
-		document.getElementById('<inp2:m_get name="item_prefix" no_html_escape="1" js_escape="1"/>_div').setAttribute('group_id', <inp2:m_get name="group_id" no_html_escape="1" js_escape="1"/>);
-		maximizeElement( jq('#<inp2:m_get name="item_prefix" no_html_escape="1" js_escape="1"/>_div') );
+		document.getElementById('<inp2:m_get name="item_prefix" js_escape="1"/>_div').setAttribute('group_id', <inp2:m_get name="group_id" js_escape="1"/>);
+		maximizeElement( jq('#<inp2:m_get name="item_prefix" js_escape="1"/>_div') );
 	}
 	<inp2:m_if check="c_SaveWarning">
 		document.getElementById('save_warning').style.display = 'block';
Index: branches/5.2.x/admin_templates/catalog_tab.tpl
===================================================================
diff -u -N -r16059 -r16612
--- branches/5.2.x/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 16059)
+++ branches/5.2.x/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 16612)
@@ -67,7 +67,7 @@
 		<inp2:$prefix_InitList grid="$grid_name"/>
 
 		$Catalog.setItemCount('<inp2:m_param name="prefix"/>', '<inp2:{$prefix}_CatalogItemCount/>');
-		$Catalog.setCurrentCategory('<inp2:m_param name="prefix"/>', <inp2:m_get name="m_cat_id" no_html_escape="1" js_escape="1"/>);
+		$Catalog.setCurrentCategory('<inp2:m_param name="prefix"/>', <inp2:m_get name="m_cat_id" js_escape="1"/>);
 		$Catalog.saveSearch('<inp2:m_Param name="prefix"/>', '<inp2:$prefix_SearchKeyword js_escape="1"/>', '<inp2:m_Param name="grid_name"/>');
 
 		<inp2:m_DefineElement name="qty_td">