diff --git a/admin-dev/themes/default/template/controllers/modules_positions/form.tpl b/admin-dev/themes/default/template/controllers/modules_positions/form.tpl
index dbce5cbc7..39eca9ff9 100644
--- a/admin-dev/themes/default/template/controllers/modules_positions/form.tpl
+++ b/admin-dev/themes/default/template/controllers/modules_positions/form.tpl
@@ -73,39 +73,37 @@
 	</fieldset>
 </form>
 <script type="text/javascript">
-	//<![CDATA	
-	$(document).ready(function()
+	//<![CDATA
+	function position_exception_textchange()
 	{
-		function position_exception_textchange(obj)
-		{
-			var shopID = obj.attr('id').replace(/\D/g, '');
-			var list = obj.parent().find('#em_list_' + shopID);
-			var values = obj.val().split(',');
-			var len = values.length;
-	
-			list.find('option').prop('selected', false);
-			for (var i = 0; i < len; i++)
-				list.find('option[value="' + $.trim(values[i]) + '"]').prop('selected', true);			
-		}
-
-		function position_exception_listchange(obj)
-		{
-			var shopID = obj.attr('id').replace(/\D/g, '');
-			var str = '';
-			obj.find('option:selected').each(function(){
-				str += obj.val()+', ';
-			});
-	
-			if (str.length > 2)
-				str = str.substr(0, str.length - 2);
-			obj.parent().find('#em_text_' + shopID).val(str);
-		}
+		// TODO : Add & Remove automatically the "custom pages" in the "em_list_x"
+		var obj = $(this);
+		var shopID = obj.attr('id').replace(/\D/g, '');
+		var list = obj.parent().find('#em_list_' + shopID);
+		var values = obj.val().split(',');
+		var len = values.length;
 		
-		$('form[id="hook_module_form"] input[id^="em_text_"]').on('change', function(){
-				position_exception_textchange($(this));
-			}).change();	
-		$('form[id="hook_module_form"] select[id^="em_list_"]').on('change', function(){
-				position_exception_listchange($(this));
+		list.find('option').prop('selected', false);
+		for (var i = 0; i < len; i++)
+			list.find('option[value="' + $.trim(values[i]) + '"]').prop('selected', true);
+	}
+
+	function position_exception_listchange()
+	{
+		var obj = $(this);
+		var shopID = obj.attr('id').replace(/\D/g, '');
+		var str = obj.val().join(', ');
+		
+		obj.parent().find('#em_text_' + shopID).val(str);
+	}
+	
+	$(document).ready(function(){
+		$('form[id="hook_module_form"] input[id^="em_text_"]').each(function(){
+			$(this).change(position_exception_textchange).change();
+		});
+
+		$('form[id="hook_module_form"] select[id^="em_list_"]').each(function(){
+			$(this).change(position_exception_listchange);
 		});
 	});
 	//]]>
diff --git a/install-dev/upgrade/php/set_product_suppliers.php b/install-dev/upgrade/php/set_product_suppliers.php
index b18693aae..14e348ed7 100644
--- a/install-dev/upgrade/php/set_product_suppliers.php
+++ b/install-dev/upgrade/php/set_product_suppliers.php
@@ -46,8 +46,8 @@ function set_product_suppliers()
 				`id_currency`)
 			VALUES
 			("'.(int)$row['id_product'].'", "0", "'.(int)$row['id_supplier'].'", 
-			"'.(int)$row['supplier_reference'].'", "'.(int)$row['wholesale_price'].'", 
-				"'.(int)$ps_currency_default.'"
+			"'.pSQL($row['supplier_reference']).'", "'.(int)$row['wholesale_price'].'", 
+				"'.(int)$ps_currency_default.'")
 		');
 
 		//Try to get product attribues
@@ -68,7 +68,7 @@ function set_product_suppliers()
 				`product_supplier_price_te`, `id_currency`)
 				VALUES
 				("'.(int)$row['id_product'].'", "'.(int)$attribute['id_product_attribute'].'", 
-				"'.(int)$row['id_supplier'].'", "'.(int)$attribute['supplier_reference'].'", 
+				"'.(int)$row['id_supplier'].'", "'.pSQL($attribute['supplier_reference']).'", 
 				"'.(int)$attribute['wholesale_price'].'", "'.(int)$ps_currency_default.'")
 			');
 		}