Index: branches/5.2.x/admin_templates/duplicate_checker.tpl
===================================================================
diff -u -r16060 -r16606
--- branches/5.2.x/admin_templates/duplicate_checker.tpl	(.../duplicate_checker.tpl)	(revision 16060)
+++ branches/5.2.x/admin_templates/duplicate_checker.tpl	(.../duplicate_checker.tpl)	(revision 16606)
@@ -42,9 +42,9 @@
 						$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"/>
-						$Menus['l.duplicates_grouping_menu'].addItem(rs('l.duplicates.group.name'), 'Name', 'javascript:set_grouping("l.duplicates", "|l<inp2:m_Param name="language"/>_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.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"/>_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>);
+						$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>);
 
 						// add grouping menu to view menu
 						$Menus['l.duplicates_view_menu'].addItem(
Index: branches/5.2.x/admin_templates/links/links_relations.tpl
===================================================================
diff -u -r16342 -r16606
--- branches/5.2.x/admin_templates/links/links_relations.tpl	(.../links_relations.tpl)	(revision 16342)
+++ branches/5.2.x/admin_templates/links/links_relations.tpl	(.../links_relations.tpl)	(revision 16606)
@@ -101,5 +101,5 @@
 <inp2:m_include t="incs/footer"/>
 
 <script type="text/javascript">
-	var $env = document.getElementById('sid').value+'-:m<inp2:m_get name="m_cat_id"/>-1-1-1-s';
-</script>
\ No newline at end of file
+	var $env = document.getElementById('sid').value+'-:m<inp2:m_get name="m_cat_id" js_escape="1"/>-1-1-1-s';
+</script>