Index: branches/5.3.x/admin_templates/orders/orders_edit_preview.tpl
===================================================================
diff -u -N -r15492 -r15971
--- branches/5.3.x/admin_templates/orders/orders_edit_preview.tpl	(.../orders_edit_preview.tpl)	(revision 15492)
+++ branches/5.3.x/admin_templates/orders/orders_edit_preview.tpl	(.../orders_edit_preview.tpl)	(revision 15971)
@@ -33,7 +33,7 @@
 				a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 
 				a_toolbar.AddButton( new ToolBarButton('print', '<inp2:m_phrase label="la_ToolTip_Print" escape="1"/>', function() {
-							openSelector('ord', '<inp2:m_Link template="in-commerce/orders/orders_edit_print" pass="all"/>', '', '750x700');
+							openSelector('ord', '<inp2:m_Link template="in-commerce/orders/orders_edit_print" pass="all" no_amp="1" js_escape="1"/>', '', '750x700');
 						}
 				 ) );
 
Index: branches/5.3.x/admin_templates/products/products_packagecontent.tpl
===================================================================
diff -u -N -r15492 -r15971
--- branches/5.3.x/admin_templates/products/products_packagecontent.tpl	(.../products_packagecontent.tpl)	(revision 15492)
+++ branches/5.3.x/admin_templates/products/products_packagecontent.tpl	(.../products_packagecontent.tpl)	(revision 15971)
@@ -35,7 +35,7 @@
 
 				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_Add_Items" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
 						function() {
-							openSelector('p', '<inp2:adm_SelectorLink prefix="p" selection_mode="multi" tab_prefixes="p"/>', 'PackageContent', null, 'OnSaveItems');
+							openSelector('p', '<inp2:adm_SelectorLink prefix="p" selection_mode="multi" tab_prefixes="p" no_amp="1" js_escape="1"/>', 'PackageContent', null, 'OnSaveItems');
 						} ) );
 
 				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
Index: branches/5.3.x/admin_templates/discounts/coupon_items.tpl
===================================================================
diff -u -N -r15492 -r15971
--- branches/5.3.x/admin_templates/discounts/coupon_items.tpl	(.../coupon_items.tpl)	(revision 15492)
+++ branches/5.3.x/admin_templates/discounts/coupon_items.tpl	(.../coupon_items.tpl)	(revision 15971)
@@ -41,7 +41,7 @@
 
 				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_New_Products" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Add" escape="1"/>',
 						function() {
-							openSelector('coupi', '<inp2:adm_SelectorLink prefix="coupi" selection_mode="multi" tabs_dependant="no" tab_prefixes="p"/>', '');
+							openSelector('coupi', '<inp2:adm_SelectorLink prefix="coupi" selection_mode="multi" tabs_dependant="no" tab_prefixes="p" no_amp="1" js_escape="1"/>', '');
 						} ) );
 
 
Index: branches/5.3.x/admin_templates/orders/export/export.tpl
===================================================================
diff -u -N -r15492 -r15971
--- branches/5.3.x/admin_templates/orders/export/export.tpl	(.../export.tpl)	(revision 15492)
+++ branches/5.3.x/admin_templates/orders/export/export.tpl	(.../export.tpl)	(revision 15971)
@@ -108,7 +108,7 @@
 		Request.method = 'POST';
 		Request.params = Request.serializeForm($kf);
 		$kf.elements['events[ord.export]'].value = tmp;
-		Request.makeRequest('<inp2:m_t ajax="1" ord.export_event="OnDeleteExportPreset" js_escape="1" no_amp="1"/>', delete_busy, '', function() {
+		Request.makeRequest('<inp2:m_t ajax="1" ord.export_event="OnDeleteExportPreset" no_amp="1" js_escape="1"/>', delete_busy, '', function() {
 			presets = document.getElementById('<inp2:ord.export_InputName field="ExportPresets"/>');
 
 			for (i=0; i< presets.options.length; i++) {
Index: branches/5.3.x/admin_templates/import.tpl
===================================================================
diff -u -N -r15492 -r15971
--- branches/5.3.x/admin_templates/import.tpl	(.../import.tpl)	(revision 15492)
+++ branches/5.3.x/admin_templates/import.tpl	(.../import.tpl)	(revision 15971)
@@ -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.3.x/admin_templates/affiliate_plans/affiliate_plans_items.tpl
===================================================================
diff -u -N -r15671 -r15971
--- branches/5.3.x/admin_templates/affiliate_plans/affiliate_plans_items.tpl	(.../affiliate_plans_items.tpl)	(revision 15671)
+++ branches/5.3.x/admin_templates/affiliate_plans/affiliate_plans_items.tpl	(.../affiliate_plans_items.tpl)	(revision 15971)
@@ -41,7 +41,7 @@
 
 				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_New_Products" escape="1"/>',
 						function() {
-							openSelector('api', '<inp2:adm_SelectorLink prefix="api" selection_mode="multi" tabs_dependant="no" tab_prefixes="p"/>', '');
+							openSelector('api', '<inp2:adm_SelectorLink prefix="api" selection_mode="multi" tabs_dependant="no" tab_prefixes="p" no_amp="1" js_escape="1"/>', '');
 						} ) );
 
 
Index: branches/5.3.x/admin_templates/reports/results.tpl
===================================================================
diff -u -N -r15492 -r15971
--- branches/5.3.x/admin_templates/reports/results.tpl	(.../results.tpl)	(revision 15492)
+++ branches/5.3.x/admin_templates/reports/results.tpl	(.../results.tpl)	(revision 15971)
@@ -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>
Index: branches/5.3.x/admin_templates/products/products_categories.tpl
===================================================================
diff -u -N -r15492 -r15971
--- branches/5.3.x/admin_templates/products/products_categories.tpl	(.../products_categories.tpl)	(revision 15492)
+++ branches/5.3.x/admin_templates/products/products_categories.tpl	(.../products_categories.tpl)	(revision 15971)
@@ -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('p', '<inp2:adm_SelectorLink prefix="p" selection_mode="multi" tab_prefixes="none"/>', 'ItemCategory');
+							openSelector('p', '<inp2:adm_SelectorLink prefix="p" 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.3.x/admin_templates/discounts/coupons_list.tpl
===================================================================
diff -u -N -r15492 -r15971
--- branches/5.3.x/admin_templates/discounts/coupons_list.tpl	(.../coupons_list.tpl)	(revision 15492)
+++ branches/5.3.x/admin_templates/discounts/coupons_list.tpl	(.../coupons_list.tpl)	(revision 15971)
@@ -28,7 +28,7 @@
 				a_toolbar.AddButton( new ToolBarButton('clone', '<inp2:m_phrase label="la_ToolTip_Clone" escape="1"/>',
 							function() {
 								//set_event('sc', 'OnSaveCreated');
-								openSelector('coup', '<inp2:m_Link template="in-commerce/discounts/coupon_clone_selector" pass="all"/>', '', '600x260', 'OnPrepareClone');
+								openSelector('coup', '<inp2:m_Link template="in-commerce/discounts/coupon_clone_selector" pass="all" no_amp="1" js_escape="1"/>', '', '600x260', 'OnPrepareClone');
 							} ) );
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
Index: branches/5.3.x/admin_templates/import_progress.tpl
===================================================================
diff -u -N -r15492 -r15971
--- branches/5.3.x/admin_templates/import_progress.tpl	(.../import_progress.tpl)	(revision 15492)
+++ branches/5.3.x/admin_templates/import_progress.tpl	(.../import_progress.tpl)	(revision 15971)
@@ -10,7 +10,7 @@
 		submit_event('p.import', 'OnExportCancel');
 	}
 
-	$ProductImport = new AjaxProgressBar('<inp2:m_t t="dummy" p.import_event="OnExportProgress" pass="m,p.import" js_escape="1"/>');
+	$ProductImport = new AjaxProgressBar('<inp2:m_t t="dummy" p.import_event="OnExportProgress" pass="m,p.import" no_amp="1" js_escape="1"/>');
 </script>
 
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/5.3.x/admin_templates/orders/export/export_progress.tpl
===================================================================
diff -u -N -r15492 -r15971
--- branches/5.3.x/admin_templates/orders/export/export_progress.tpl	(.../export_progress.tpl)	(revision 15492)
+++ branches/5.3.x/admin_templates/orders/export/export_progress.tpl	(.../export_progress.tpl)	(revision 15971)
@@ -10,7 +10,7 @@
 		submit_event('ord.export', 'OnExportCancel');
 	}
 
-	$ProductExport = new AjaxProgressBar('<inp2:m_t t="in-commerce/orders/export/export_status_xml" no_amp="1"/>');
+	$ProductExport = new AjaxProgressBar('<inp2:m_t t="in-commerce/orders/export/export_status_xml" no_amp="1" js_escape="1"/>');
 </script>
 
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/5.3.x/admin_templates/products/products_relations.tpl
===================================================================
diff -u -N -r15492 -r15971
--- branches/5.3.x/admin_templates/products/products_relations.tpl	(.../products_relations.tpl)	(revision 15492)
+++ branches/5.3.x/admin_templates/products/products_relations.tpl	(.../products_relations.tpl)	(revision 15971)
@@ -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('rel', '<inp2:adm_SelectorLink prefix="rel" selection_mode="single" tab_prefixes="all"/>', 'TargetId', '950x600');
+							openSelector('rel', '<inp2:adm_SelectorLink prefix="rel" selection_mode="single" tab_prefixes="all" no_amp="1" js_escape="1"/>', 'TargetId', '950x600');
 						} ) );
 
 				function edit()
Index: branches/5.3.x/units/products/products_tag_processor.php
===================================================================
diff -u -N -r15899 -r15971
--- branches/5.3.x/units/products/products_tag_processor.php	(.../products_tag_processor.php)	(revision 15899)
+++ branches/5.3.x/units/products/products_tag_processor.php	(.../products_tag_processor.php)	(revision 15971)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: products_tag_processor.php 15899 2013-07-12 10:32:25Z alex $
+* @version	$Id: products_tag_processor.php 15971 2013-10-03 12:09:26Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -836,7 +836,7 @@
 	 */
 	protected function CompareLink($params)
 	{
-		$params['continue'] = kUtil::escape($this->Application->HREF('__default__', '', Array ('pass_category' => 1)), kUtil::ESCAPE_URL);
+		$params['continue'] = $this->Application->HREF('__default__', '', Array ('pass_category' => 1));
 
 		return $this->Application->ProcessParsedTag('m', 'Link', $params);
 	}
Index: branches/5.3.x/admin_templates/affiliate_plans/affiliates_edit.tpl
===================================================================
diff -u -N -r15671 -r15971
--- branches/5.3.x/admin_templates/affiliate_plans/affiliates_edit.tpl	(.../affiliates_edit.tpl)	(revision 15671)
+++ branches/5.3.x/admin_templates/affiliate_plans/affiliates_edit.tpl	(.../affiliates_edit.tpl)	(revision 15971)
@@ -34,7 +34,7 @@
 					a_toolbar.AddButton( new ToolBarSeparator('sep2') );
 
 					a_toolbar.AddButton( new ToolBarButton('in-commerce:pay_out', '<inp2:m_phrase label="la_ToolTip_PayOut" escape="1"/>', function() {
-						direct_edit('affil', '<inp2:m_t t="in-commerce/affiliate_plans/affiliates_payout" m_opener="d" apayments_event="OnNew" pass="all,apayments"/>');
+						direct_edit('affil', '<inp2:m_t t="in-commerce/affiliate_plans/affiliates_payout" m_opener="d" apayments_event="OnNew" pass="all,apayments" no_amp="1" js_escape="1"/>');
 						}
 					) );
 				</inp2:m_if>
Index: branches/5.3.x/admin_templates/products/products_options.tpl
===================================================================
diff -u -N -r15492 -r15971
--- branches/5.3.x/admin_templates/products/products_options.tpl	(.../products_options.tpl)	(revision 15492)
+++ branches/5.3.x/admin_templates/products/products_options.tpl	(.../products_options.tpl)	(revision 15971)
@@ -98,7 +98,7 @@
 <script type="text/javascript">
 	function openCombinations() {
 		set_hidden_field('events[poc.edit]', 'OnNew');
-		openSelector('p', '<inp2:m_Link t="in-commerce/products/option_combinations" pass="all,poc" poc_id=""/>', '', '800x600');
+		openSelector('p', '<inp2:m_Link t="in-commerce/products/option_combinations" pass="all,poc" poc_id="" no_amp="1" js_escape="1"/>', '', '800x600');
 	}
 </script>
 
Index: branches/5.3.x/admin_templates/orders/orders_edit_billing.tpl
===================================================================
diff -u -N -r15492 -r15971
--- branches/5.3.x/admin_templates/orders/orders_edit_billing.tpl	(.../orders_edit_billing.tpl)	(revision 15492)
+++ branches/5.3.x/admin_templates/orders/orders_edit_billing.tpl	(.../orders_edit_billing.tpl)	(revision 15971)
@@ -67,7 +67,7 @@
 
 <script type="text/javascript">
 	function OpenGWResults(field) {
-		openSelector('ord', '<inp2:m_Link template="in-commerce/orders/gw_results" pass="m,ord"/>&field=' + field, '', '500x400');
+		openSelector('ord', '<inp2:m_Link template="in-commerce/orders/gw_results" pass="m,ord" no_amp="1" js_escape="1"/>&field=' + field, '', '500x400');
 	}
 </script>
 
Index: branches/5.3.x/admin_templates/products/products_edit.tpl
===================================================================
diff -u -N -r15687 -r15971
--- branches/5.3.x/admin_templates/products/products_edit.tpl	(.../products_edit.tpl)	(revision 15687)
+++ branches/5.3.x/admin_templates/products/products_edit.tpl	(.../products_edit.tpl)	(revision 15971)
@@ -170,11 +170,11 @@
     }
 
 	function openShipping() {
-		openSelector('p','<inp2:m_link t="in-commerce/products/shipping_options" pass="all"/>', 'ShippingOption', '800x600', 'OnPreSaveAndOpenPopup');
+		openSelector('p','<inp2:m_link t="in-commerce/products/shipping_options" pass="all" no_amp="1" js_escape="1"/>', 'ShippingOption', '800x600', 'OnPreSaveAndOpenPopup');
 	}
 
 	function openCouponSelector() {
-		openSelector('p','<inp2:m_link t="in-commerce/discounts/coupon_selector" pass="all"/>', 'AssignedCoupon', '800x400', 'OnPreSaveAndOpenPopup');
+		openSelector('p','<inp2:m_link t="in-commerce/discounts/coupon_selector" pass="all" no_amp="1" js_escape="1"/>', 'AssignedCoupon', '800x400', 'OnPreSaveAndOpenPopup');
 	}
 </script>
 
Index: branches/5.3.x/admin_templates/orders/orders_edit_items.tpl
===================================================================
diff -u -N -r15492 -r15971
--- branches/5.3.x/admin_templates/orders/orders_edit_items.tpl	(.../orders_edit_items.tpl)	(revision 15492)
+++ branches/5.3.x/admin_templates/orders/orders_edit_items.tpl	(.../orders_edit_items.tpl)	(revision 15971)
@@ -48,7 +48,7 @@
 					//Order items related:
 					a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_Add_Items" escape="1"/>',
 							function() {
-								openSelector('orditems', '<inp2:adm_SelectorLink prefix="ord" selection_mode="single" tab_prefixes="p"/>', '', null, 'OnSaveItems');
+								openSelector('orditems', '<inp2:adm_SelectorLink prefix="ord" selection_mode="single" tab_prefixes="p" no_amp="1" js_escape="1"/>', '', null, 'OnSaveItems');
 							} ) );
 
 					a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>',
Index: branches/5.3.x/admin_templates/shipping/shipping_costs.tpl
===================================================================
diff -u -N -r15492 -r15971
--- branches/5.3.x/admin_templates/shipping/shipping_costs.tpl	(.../shipping_costs.tpl)	(revision 15492)
+++ branches/5.3.x/admin_templates/shipping/shipping_costs.tpl	(.../shipping_costs.tpl)	(revision 15971)
@@ -47,7 +47,7 @@
 
 				a_toolbar.AddButton( new ToolBarButton('in-commerce:modify', '<inp2:m_phrase label="la_ToolTip_Modify" escape="1"/>',
 							function() {
-								openSelector('s', '<inp2:m_t t="in-commerce/shipping/modify_selector" pass="all,sc" sc_event="OnSaveCreated"/>');
+								openSelector('s', '<inp2:m_t t="in-commerce/shipping/modify_selector" pass="all,sc" sc_event="OnSaveCreated" no_amp="1" js_escape="1"/>');
 							} ) );
 				a_toolbar.Render();
 
Index: branches/5.3.x/admin_templates/products/products_pricing.tpl
===================================================================
diff -u -N -r15492 -r15971
--- branches/5.3.x/admin_templates/products/products_pricing.tpl	(.../products_pricing.tpl)	(revision 15492)
+++ branches/5.3.x/admin_templates/products/products_pricing.tpl	(.../products_pricing.tpl)	(revision 15971)
@@ -64,7 +64,7 @@
 					set_hidden_field('t', $prev_template);
 				}
 
-	  			var $BracketManager = new Catalog('<inp2:m_Link template="in-commerce/products/products_pricing_grid" item_prefix="#ITEM_PREFIX#" group_id="#GROUP_ID#" no_amp="1" pass="m,p,pr.tang"/>', 'permmanager_', 'ProductPriceBracketManager');
+	  			var $BracketManager = new Catalog('<inp2:m_Link template="in-commerce/products/products_pricing_grid" item_prefix="#ITEM_PREFIX#" group_id="#GROUP_ID#" pass="m,p,pr.tang" no_amp="1" js_escape="1"/>', 'permmanager_', 'ProductPriceBracketManager');
 
 		</script>
 
@@ -131,7 +131,7 @@
 		  			}
 	  			}
 				a_toolbar.AddButton( new ToolBarButton('delete', '<inp2:m_phrase label="la_ToolTip_DeleteGroupPricing" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Delete" escape="1"/>', delete_brackets) );
-			
+
 				function edit(){ }
 
 				a_toolbar.Render();
@@ -151,7 +151,7 @@
 				</inp2:m_if>
 
 				a_toolbar.DisableButton('delete');
-				
+
 			</script>
 		</td>
 
Index: branches/5.3.x/admin_templates/reports/progress.tpl
===================================================================
diff -u -N -r15492 -r15971
--- branches/5.3.x/admin_templates/reports/progress.tpl	(.../progress.tpl)	(revision 15492)
+++ branches/5.3.x/admin_templates/reports/progress.tpl	(.../progress.tpl)	(revision 15971)
@@ -7,9 +7,9 @@
 	function cancel_action() {
 		submit_event('rep', 'OnGoBack');
 	}
-	// $ProductExport = new AjaxProgressBar('<inp2:m_t t="../../plugins/reports/admin_templates/status_xml" no_amp="1"/>');
+	// $ProductExport = new AjaxProgressBar('<inp2:m_t t="../../plugins/reports/admin_templates/status_xml" no_amp="1" js_escape="1"/>');
 
-	$ProductExport = new AjaxProgressBar('<inp2:m_Link template="in-commerce/reports/status_xml" no_amp="1"/>');
+	$ProductExport = new AjaxProgressBar('<inp2:m_Link template="in-commerce/reports/status_xml" no_amp="1" js_escape="1"/>');
 </script>
 
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/5.3.x/admin_templates/discounts/gift_certificate_list.tpl
===================================================================
diff -u -N -r15492 -r15971
--- branches/5.3.x/admin_templates/discounts/gift_certificate_list.tpl	(.../gift_certificate_list.tpl)	(revision 15492)
+++ branches/5.3.x/admin_templates/discounts/gift_certificate_list.tpl	(.../gift_certificate_list.tpl)	(revision 15971)
@@ -53,7 +53,7 @@
 	addLoadEvent(
 		function() {
 			<inp2:m_if check="m_Recall" name="print_certificate_id">
-				openSelector('gc', '<inp2:gc_PrintLink template="in-commerce/discounts/gift_certificate_print" no_amp="1"/>');
+				openSelector('gc', '<inp2:gc_PrintLink template="in-commerce/discounts/gift_certificate_print" no_amp="1" js_escape="1"/>');
 			</inp2:m_if>
 		}
 	);
Index: branches/5.3.x/admin_templates/export_progress.tpl
===================================================================
diff -u -N -r15492 -r15971
--- branches/5.3.x/admin_templates/export_progress.tpl	(.../export_progress.tpl)	(revision 15492)
+++ branches/5.3.x/admin_templates/export_progress.tpl	(.../export_progress.tpl)	(revision 15971)
@@ -10,7 +10,7 @@
 		submit_event('p.export', 'OnExportCancel');
 	}
 
-	$ProductExport = new AjaxProgressBar('<inp2:m_t t="dummy" p.export_event="OnExportProgress" pass="m,p.export" js_escape="1"/>');
+	$ProductExport = new AjaxProgressBar('<inp2:m_t t="dummy" p.export_event="OnExportProgress" pass="m,p.export" no_amp="1" js_escape="1"/>');
 </script>
 
 <inp2:m_include t="incs/footer"/>
\ No newline at end of file
Index: branches/5.3.x/admin_templates/discounts/discount_items.tpl
===================================================================
diff -u -N -r15492 -r15971
--- branches/5.3.x/admin_templates/discounts/discount_items.tpl	(.../discount_items.tpl)	(revision 15492)
+++ branches/5.3.x/admin_templates/discounts/discount_items.tpl	(.../discount_items.tpl)	(revision 15971)
@@ -41,7 +41,7 @@
 
 				a_toolbar.AddButton( new ToolBarButton('new_item', '<inp2:m_phrase label="la_ToolTip_New_Products" escape="1"/>',
 						function() {
-							openSelector('di', '<inp2:adm_SelectorLink prefix="di" selection_mode="multi" tabs_dependant="no" tab_prefixes="p"/>', '');
+							openSelector('di', '<inp2:adm_SelectorLink prefix="di" selection_mode="multi" tabs_dependant="no" tab_prefixes="p" no_amp="1" js_escape="1"/>', '');
 						} ) );