Index: branches/5.2.x/admin_templates/duplicate_checker.tpl
===================================================================
diff -u -N -r16606 -r16613
--- branches/5.2.x/admin_templates/duplicate_checker.tpl	(.../duplicate_checker.tpl)	(revision 16606)
+++ branches/5.2.x/admin_templates/duplicate_checker.tpl	(.../duplicate_checker.tpl)	(revision 16613)
@@ -41,7 +41,7 @@
 						$Menus['l.duplicates_grouping_menu'].applyBorder(false, false, false, false);
 						$Menus['l.duplicates_grouping_menu'].dropShadow("none");
 						$Menus['l.duplicates_grouping_menu'].showIcon = true;
-						<inp2:m_Get name="m_lang" no_html_escape="1" result_to_var="language"/>
+						<inp2:m_Get name="m_lang" result_to_var="language"/>
 						$Menus['l.duplicates_grouping_menu'].addItem(rs('l.duplicates.group.name'), 'Name', 'javascript:set_grouping("l.duplicates", "|l<inp2:m_Param name="language" js_escape="1"/>_Name|");' <inp2:m_if check="m_RecallEquals" name="l.duplicates_dupe_fields" value="|l{$language}_Name|">,['img/check_on.gif']</inp2:m_if>);
 						$Menus['l.duplicates_grouping_menu'].addItem(rs('l.duplicates.group.url'), 'Url',  'javascript:set_grouping("l.duplicates", "|Url|");' <inp2:m_if check="m_RecallEquals" name="l.duplicates_dupe_fields" value="|Url|">,['img/check_on.gif']</inp2:m_if>);
 						$Menus['l.duplicates_grouping_menu'].addItem(rs('l.duplicates.group.name.url'), 'Name <inp2:m_phrase name="la_and"/> Url', 'javascript:set_grouping("l.duplicates", "|l<inp2:m_Param name="language" js_escape="1"/>_Name|Url|");' <inp2:m_if check="m_RecallEquals" name="l.duplicates_dupe_fields" value="|l{$language}_Name|Url|">,['img/check_on.gif']</inp2:m_if>);
Index: branches/5.2.x/admin_templates/catalog_tab.tpl
===================================================================
diff -u -N -r16060 -r16613
--- branches/5.2.x/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 16060)
+++ branches/5.2.x/admin_templates/catalog_tab.tpl	(.../catalog_tab.tpl)	(revision 16613)
@@ -28,7 +28,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_RenderElement name="grid_js" PrefixSpecial="$prefix" IdField="LinkId" grid="$grid_name" menu_filters="yes"/>
Index: branches/5.2.x/admin_templates/user_item_tab.tpl
===================================================================
diff -u -N -r16060 -r16613
--- branches/5.2.x/admin_templates/user_item_tab.tpl	(.../user_item_tab.tpl)	(revision 16060)
+++ branches/5.2.x/admin_templates/user_item_tab.tpl	(.../user_item_tab.tpl)	(revision 16613)
@@ -15,7 +15,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_RenderElement name="grid_js" PrefixSpecial="$prefix" IdField="LinkId" grid="$grid_name" menu_filters="yes"/>