Index: branches/5.3.x/admin_templates/topics/topics_relations.tpl
===================================================================
diff -u -N -r15490 -r15970
--- branches/5.3.x/admin_templates/topics/topics_relations.tpl	(.../topics_relations.tpl)	(revision 15490)
+++ branches/5.3.x/admin_templates/topics/topics_relations.tpl	(.../topics_relations.tpl)	(revision 15970)
@@ -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('bb-rel', '<inp2:adm_SelectorLink prefix="bb-rel" selection_mode="single" tab_prefixes="all"/>', 'TargetId', '950x600');
+							openSelector('bb-rel', '<inp2:adm_SelectorLink prefix="bb-rel" selection_mode="single" tab_prefixes="all" no_amp="1" js_escape="1"/>', 'TargetId', '950x600');
 						} ) );
 
 				function edit()
Index: branches/5.3.x/admin_templates/topics/topics_categories.tpl
===================================================================
diff -u -N -r15490 -r15970
--- branches/5.3.x/admin_templates/topics/topics_categories.tpl	(.../topics_categories.tpl)	(revision 15490)
+++ branches/5.3.x/admin_templates/topics/topics_categories.tpl	(.../topics_categories.tpl)	(revision 15970)
@@ -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('bb', '<inp2:adm_SelectorLink prefix="bb" selection_mode="multi" tab_prefixes="none"/>', 'ItemCategory');
+							openSelector('bb', '<inp2:adm_SelectorLink prefix="bb" 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"/>',