diff --git a/classes/tax/TaxRulesTaxManager.php b/classes/tax/TaxRulesTaxManager.php
index 049a3977d..4c1de21b7 100644
--- a/classes/tax/TaxRulesTaxManager.php
+++ b/classes/tax/TaxRulesTaxManager.php
@@ -83,7 +83,7 @@ class TaxRulesTaxManagerCore implements TaxManagerInterface
 			WHERE `id_country` = '.(int)$this->address->id_country.'
 			AND `id_tax_rules_group` = '.(int)$this->type.'
 			AND `id_state` IN (0, '.(int)$this->address->id_state.')
-			AND (\''.pSQL($postcode).'\' BETWEEN `zipcode_from` AND `zipcode_to` OR `zipcode_from` = 0 OR `zipcode_from` = \''.pSQL($postcode).'\')
+			AND (\''.pSQL($postcode).'\' BETWEEN `zipcode_from` AND `zipcode_to` OR (`zipcode_to` = 0 AND `zipcode_from` IN(0, \''.pSQL($postcode).'\')))
 			ORDER BY `zipcode_from` DESC, `zipcode_to` DESC, `id_state` DESC, `id_country` DESC');
 
 			$behavior = 0;
diff --git a/controllers/admin/AdminCartsController.php b/controllers/admin/AdminCartsController.php
index 2dd2c32d4..959cfdc43 100755
--- a/controllers/admin/AdminCartsController.php
+++ b/controllers/admin/AdminCartsController.php
@@ -462,7 +462,7 @@ class AdminCartsControllerCore extends AdminController
 			{
 				$cart_rule = new CartRule();
 				$cart_rule->code = 'BO_ORDER_'.(int)$this->context->cart->id;
-				$cart_rule->name = array(Configuration::get('PS_LANG_DEFAULT') => $this->l('Free Shipping'));
+				$cart_rule->name = array(Configuration::get('PS_LANG_DEFAULT') => $this->l('Free Shipping', 'AdminTab', false, false));
 				$cart_rule->id_customer = (int)$this->context->cart->id_customer;
 				$cart_rule->free_shipping = true;
 				$cart_rule->quantity = 1;
diff --git a/controllers/admin/AdminTaxRulesGroupController.php b/controllers/admin/AdminTaxRulesGroupController.php
index c7621c90f..25f40f1a0 100644
--- a/controllers/admin/AdminTaxRulesGroupController.php
+++ b/controllers/admin/AdminTaxRulesGroupController.php
@@ -298,7 +298,7 @@ class AdminTaxRulesGroupControllerCore extends AdminController
 						'id' => 'id_tax',
 						'name' => 'name',
 						'default' => array(
-							'value' => 'name',
+							'value' => 0,
 							'label' => $this->l('No Tax')
 						)
 					),
diff --git a/install-dev/data/db_structure.sql b/install-dev/data/db_structure.sql
index bf5cbc15c..307dc50d3 100644
--- a/install-dev/data/db_structure.sql
+++ b/install-dev/data/db_structure.sql
@@ -1177,7 +1177,7 @@ CREATE TABLE `PREFIX_order_cart_rule` (
   `id_order` int(10) unsigned NOT NULL,
   `id_cart_rule` int(10) unsigned NOT NULL,
   `id_order_invoice` int(10) unsigned DEFAULT 0,
-  `name` varchar(32) NOT NULL,
+  `name` varchar(254) NOT NULL,
   `value` decimal(17,2) NOT NULL default '0.00',
   `value_tax_excl` decimal(17,2) NOT NULL default '0.00',
   PRIMARY KEY (`id_order_cart_rule`),
diff --git a/install-dev/upgrade/sql/1.5.3.0.sql b/install-dev/upgrade/sql/1.5.3.0.sql
index 53cc5c870..b50f1043d 100644
--- a/install-dev/upgrade/sql/1.5.3.0.sql
+++ b/install-dev/upgrade/sql/1.5.3.0.sql
@@ -18,4 +18,6 @@ UPDATE `PREFIX_order_state_lang` SET `template` = 'payment' WHERE `id_order_stat
 
 DELETE FROM `PREFIX_configuration` WHERE `name`= 'PS_HIGH_HTML_THEME_COMPRESSION';
 
-INSERT INTO `PREFIX_configuration`(`name`, `value`, `date_add`, `date_upd`) VALUES ('PS_MAIL_COLOR', '#db3484', NOW(), NOW());
\ No newline at end of file
+INSERT INTO `PREFIX_configuration`(`name`, `value`, `date_add`, `date_upd`) VALUES ('PS_MAIL_COLOR', '#db3484', NOW(), NOW());
+
+ALTER TABLE `PREFIX_order_cart_rule` CHANGE `name` `name` VARCHAR(254);
\ No newline at end of file