Index: branches/5.2.x/core/admin_templates/tree.tpl
===================================================================
diff -u -N -r16308 -r16339
--- branches/5.2.x/core/admin_templates/tree.tpl	(.../tree.tpl)	(revision 16308)
+++ branches/5.2.x/core/admin_templates/tree.tpl	(.../tree.tpl)	(revision 16339)
@@ -35,7 +35,7 @@
 		getFrame('head').$FrameResizer.OpenWidth = $width;
 
 		$.get(
-			'<inp2:m_Link template="index" adm_event="OnSaveMenuFrameWidth" pass="m,adm" js_escape="1" no_amp="1"/>',
+			'<inp2:m_Link template="index" adm_event="OnSaveMenuFrameWidth" pass="m,adm" no_amp="1" js_escape="1"/>',
 			{width: $width}
 		);
 
@@ -76,7 +76,7 @@
 				the_tree.AddFromXML('<tree><inp2:adm_PrintSections render_as="xml_node" section_name="in-portal:root" js_escape="1"/></tree>');
 
 				<inp2:m_if check="adm_MainFrameLink">
-					var fld = the_tree.locateItemByURL('<inp2:adm_MainFrameLink m_opener="r" no_amp="1"/>');
+					var fld = the_tree.locateItemByURL('<inp2:adm_MainFrameLink m_opener="r" js_escape="1"/>');
 					if (fld) {
 						fld.highLight();
 					}
@@ -113,7 +113,7 @@
 
 			// highlight "Structure & Data" node, when one of it's shortcut nodes are clicked
 			<inp2:m_DefineElement name="section_url_element"><inp2:m_param name="section_url"/></inp2:m_DefineElement>
-			var $structure_node = the_tree.locateItemByURL('<inp2:adm_PrintSection render_as="section_url_element" section_name="in-portal:browse"/>');
+			var $structure_node = the_tree.locateItemByURL('<inp2:adm_PrintSection render_as="section_url_element" section_name="in-portal:browse" js_escape="1"/>');
 
 			if ($catalog_type == 'AdvancedView') {
 				$right_frame.$Catalog.switchTab($prefix);