Index: branches/5.2.x/admin_templates/reports/results.tpl
===================================================================
diff -u -N -r14258 -r16341
--- branches/5.2.x/admin_templates/reports/results.tpl	(.../results.tpl)	(revision 14258)
+++ branches/5.2.x/admin_templates/reports/results.tpl	(.../results.tpl)	(revision 16341)
@@ -14,8 +14,8 @@
 
 				a_toolbar = new ToolBar();
 				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Back" escape="1"/>', function() {
-//							window.location = '<inp2:m_t t="../../plugins/reports/admin_templates/reports" "pass"="m,rep" "rep_event="OnNew"/>'
-							window.location = '<inp2:m_Link template="in-commerce/reports/reports" pass="m,rep" rep_event="OnNew" no_amp="1" />';
+//							window.location = '<inp2:m_t t="../../plugins/reports/admin_templates/reports" "pass"="m,rep" "rep_event="OnNew" no_amp="1" js_escape="1"/>'
+							window.location = '<inp2:m_Link template="in-commerce/reports/reports" pass="m,rep" rep_event="OnNew" no_amp="1" js_escape="1"/>';
 							return true;
 						}
 				 ) );
@@ -44,7 +44,7 @@
 					<inp2:m_if check="rep_IsPHPxOrGreater" version="5">
 						// Chart window open button
 						 a_toolbar.AddButton( new ToolBarButton('in-commerce:view_chart', '<inp2:m_phrase label="la_ToolTip_View_Chart" escape="1"/>', function() {
-								openSelector('rep', '<inp2:m_Link template="in-commerce/reports/chart" pass="all" js_escape="1"/>');
+								openSelector('rep', '<inp2:m_Link template="in-commerce/reports/chart" pass="all" no_amp="1" js_escape="1"/>');
 							}
 							) );
 					</inp2:m_if>