Index: branches/5.2.x/core/admin_templates/catalog/advanced_view.tpl
===================================================================
diff -u -N -r15906 -r16339
--- branches/5.2.x/core/admin_templates/catalog/advanced_view.tpl	(.../advanced_view.tpl)	(revision 15906)
+++ branches/5.2.x/core/admin_templates/catalog/advanced_view.tpl	(.../advanced_view.tpl)	(revision 16339)
@@ -23,7 +23,7 @@
 	  				$(document).ready(
 	  					function() {
 	  						Application.SetVar('continue', 1);
-	  						openSelector('c', '<inp2:m_t t="categories/cache_updater" pass="m"/>');
+	  						openSelector('c', '<inp2:m_t t="categories/cache_updater" pass="m" no_amp="1" js_escape="1"/>');
 	  					}
 	  				);
 	  			</inp2:m_if>
@@ -38,7 +38,7 @@
 	  				this.switchTab();
 	  			}
 
-	  			var $Catalog = new Catalog('<inp2:m_Link template="#TEMPLATE_NAME#" pass_through="ts,td" ts="showall" td="no" m_cat_id="#CATEGORY_ID#" no_amp="1"/>', 'advanced_view_', 'AdvancedView');
+	  			var $Catalog = new Catalog('<inp2:m_Link template="#TEMPLATE_NAME#" pass_through="ts,td" ts="showall" td="no" m_cat_id="#CATEGORY_ID#" no_amp="1" js_escape="1"/>', 'advanced_view_', 'AdvancedView');
 				var a_toolbar = new ToolBar();
 
 					<inp2:m_set ts="showall" td="no"/>
@@ -87,7 +87,7 @@
 						var $kf = document.getElementById($form_name);
 
 						var $prev_action = $kf.action;
-						$kf.action = '<inp2:m_t pass="all" no_pass_through="1"/>';
+						$kf.action = '<inp2:m_t pass="all" no_pass_through="1" no_amp="1" js_escape="1"/>';
 
 						set_hidden_field('remove_specials[' + $Catalog.ActivePrefix + ']', 1);
 						std_edit_item(
@@ -103,7 +103,7 @@
 						var $kf = document.getElementById($form_name);
 
 						var $prev_action = $kf.action;
-						$kf.action = '<inp2:m_t pass="all" no_pass_through="1"/>';
+						$kf.action = '<inp2:m_t pass="all" no_pass_through="1" no_amp="1" js_escape="1"/>';
 
 						set_hidden_field('remove_specials[' + $Catalog.ActivePrefix + ']', 1);
 						std_precreate_item(
@@ -130,7 +130,7 @@
 	var $menu_frame = getFrame('menu');
 	if (typeof $menu_frame.ShowStructure != 'undefined') {
 		<inp2:m_DefineElement name="structure_node"><inp2:m_param name="section_url"/></inp2:m_DefineElement>
-		$menu_frame.ShowStructure('<inp2:adm_PrintSection js_escape="1" render_as="structure_node" section_name="in-portal:browse"/>', false);
+		$menu_frame.ShowStructure('<inp2:adm_PrintSection render_as="structure_node" section_name="in-portal:browse" js_escape="1"/>', false);
 	}
 
 	Application.setHook(