Index: branches/5.2.x/admin_templates/articles/articles_categories.tpl
===================================================================
diff -u -N -r14256 -r16343
--- branches/5.2.x/admin_templates/articles/articles_categories.tpl	(.../articles_categories.tpl)	(revision 14256)
+++ branches/5.2.x/admin_templates/articles/articles_categories.tpl	(.../articles_categories.tpl)	(revision 16343)
@@ -37,7 +37,7 @@
 				//Category related:
 				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_New_Category" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
 						function() {
-							openSelector('n', '<inp2:adm_SelectorLink prefix="n" selection_mode="multi" tab_prefixes="none"/>', 'ItemCategory');
+							openSelector('n', '<inp2:adm_SelectorLink prefix="n" selection_mode="multi" tab_prefixes="none" no_amp="1" js_escape="1"/>', 'ItemCategory');
 						} ) );
 
 				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
Index: branches/5.2.x/admin_templates/export_progress.tpl
===================================================================
diff -u -N -r14256 -r16343
--- branches/5.2.x/admin_templates/export_progress.tpl	(.../export_progress.tpl)	(revision 14256)
+++ branches/5.2.x/admin_templates/export_progress.tpl	(.../export_progress.tpl)	(revision 16343)
@@ -8,7 +8,7 @@
 		submit_event('n.export', 'OnExportCancel');
 	}
 
-	$LinkExport = new AjaxProgressBar('<inp2:m_t t="dummy" n.export_event="OnExportProgress" pass="m,n.export" js_escape="1"/>');
+	$LinkExport = new AjaxProgressBar('<inp2:m_t t="dummy" n.export_event="OnExportProgress" pass="m,n.export" no_amp="1" js_escape="1"/>');
 </script>
 
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/5.2.x/admin_templates/import_progress.tpl
===================================================================
diff -u -N -r14256 -r16343
--- branches/5.2.x/admin_templates/import_progress.tpl	(.../import_progress.tpl)	(revision 14256)
+++ branches/5.2.x/admin_templates/import_progress.tpl	(.../import_progress.tpl)	(revision 16343)
@@ -8,7 +8,7 @@
 		submit_event('n.import', 'OnExportCancel');
 	}
 
-	$LinkImport = new AjaxProgressBar('<inp2:m_t t="dummy" n.import_event="OnExportProgress" pass="m,n.import" js_escape="1"/>');
+	$LinkImport = new AjaxProgressBar('<inp2:m_t t="dummy" n.import_event="OnExportProgress" pass="m,n.import" no_amp="1" js_escape="1"/>');
 </script>
 
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/5.2.x/admin_templates/import.tpl
===================================================================
diff -u -N -r15266 -r16343
--- branches/5.2.x/admin_templates/import.tpl	(.../import.tpl)	(revision 15266)
+++ branches/5.2.x/admin_templates/import.tpl	(.../import.tpl)	(revision 16343)
@@ -13,7 +13,7 @@
 				a_toolbar = new ToolBar();
 
 				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
-						location.href = '<inp2:m_Link t="tools/import2"/>';
+						location.href = '<inp2:m_Link t="tools/import2" no_amp="1" js_escape="1"/>';
 					}
 				) );
 
Index: branches/5.2.x/admin_templates/articles/articles_relations.tpl
===================================================================
diff -u -N -r14256 -r16343
--- branches/5.2.x/admin_templates/articles/articles_relations.tpl	(.../articles_relations.tpl)	(revision 14256)
+++ branches/5.2.x/admin_templates/articles/articles_relations.tpl	(.../articles_relations.tpl)	(revision 16343)
@@ -35,7 +35,7 @@
 				//Relations related:
 				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_New_Relation" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
 						function() {
-							openSelector('n-rel', '<inp2:adm_SelectorLink prefix="n-rel" selection_mode="single" tab_prefixes="all"/>', 'TargetId', '950x600');
+							openSelector('n-rel', '<inp2:adm_SelectorLink prefix="n-rel" selection_mode="single" tab_prefixes="all" no_amp="1" js_escape="1"/>', 'TargetId', '950x600');
 						} ) );
 
 				function edit()