diff --git a/admin-dev/themes/default/template/controllers/products/shipping.tpl b/admin-dev/themes/default/template/controllers/products/shipping.tpl
index 42862d317..122baca91 100644
--- a/admin-dev/themes/default/template/controllers/products/shipping.tpl
+++ b/admin-dev/themes/default/template/controllers/products/shipping.tpl
@@ -31,43 +31,43 @@
 {/if}
 
 <div class="row">
-	<label class="control-label col-lg-5">{l s='Width (package):'}</label>
+	<label class="control-label col-lg-5" for="width">{l s='Width (package):'}</label>
 	<div class="input-group col-lg-2">
 		<span class="input-group-addon">{$ps_dimension_unit}</span>
-		<input maxlength="6" name="width" type="text" value="{$product->width}" onKeyUp="if (isArrowKey(event)) return ;this.value = this.value.replace(/,/g, '.');" />
+		<input maxlength="6" id="width" name="width" type="text" value="{$product->width}" onKeyUp="if (isArrowKey(event)) return ;this.value = this.value.replace(/,/g, '.');" />
 		{$bullet_common_field}
 	</div>
 </div>
 
 <div class="row">
-	<label class="control-label col-lg-5">{l s='Height (package):'}</label>
+	<label class="control-label col-lg-5" for="height">{l s='Height (package):'}</label>
 	<div class="input-group col-lg-2">
 		<span class="input-group-addon">{$ps_dimension_unit}</span>
-		<input maxlength="6" name="height" type="text" value="{$product->height}" onKeyUp="if (isArrowKey(event)) return ;this.value = this.value.replace(/,/g, '.');" />
+		<input maxlength="6" id="height" name="height" type="text" value="{$product->height}" onKeyUp="if (isArrowKey(event)) return ;this.value = this.value.replace(/,/g, '.');" />
 		{$bullet_common_field}
 	</div>
 </div>
 
 <div class="row">
-	<label class="control-label col-lg-5">{l s='Depth (package):'}</label>
+	<label class="control-label col-lg-5" for="depth">{l s='Depth (package):'}</label>
 	<div class="input-group col-lg-2">
 		<span class="input-group-addon">{$ps_dimension_unit}</span>
-		<input maxlength="6" name="depth" type="text" value="{$product->depth}" onKeyUp="if (isArrowKey(event)) return ;this.value = this.value.replace(/,/g, '.');" />
+		<input maxlength="6" id="depth" name="depth" type="text" value="{$product->depth}" onKeyUp="if (isArrowKey(event)) return ;this.value = this.value.replace(/,/g, '.');" />
 		{$bullet_common_field}
 	</div>
 </div>
 
 <div class="row">
-	<label class="control-label col-lg-5">{l s='Weight (package):'}</label>
+	<label class="control-label col-lg-5" for="weight">{l s='Weight (package):'}</label>
 	<div class="input-group col-lg-2">
 		<span class="input-group-addon">{$ps_weight_unit}</span>
-		<input maxlength="6" name="weight" type="text" value="{$product->weight}" onKeyUp="if (isArrowKey(event)) return ;this.value = this.value.replace(/,/g, '.');" />
+		<input maxlength="6" id="weight" name="weight" type="text" value="{$product->weight}" onKeyUp="if (isArrowKey(event)) return ;this.value = this.value.replace(/,/g, '.');" />
 		{$bullet_common_field}
 	</div>
 </div>
 
 <div class="row">
-	<label class="control-label col-lg-5">
+	<label class="control-label col-lg-5" for="additional_shipping_cost">
 		<span class="label-tooltip" data-toggle="tooltip"
 			title="{l s='A carrier tax will be applied.'}">
 			{l s='Additional shipping cost (per quantity):'}
@@ -76,12 +76,12 @@
 	</label>
 	<div class="input-group col-lg-2">
 		<span class="input-group-addon">{$currency->prefix}{$currency->suffix} {if $country_display_tax_label}({l s='tax excl.'}){/if}</span>
-		<input type="text" name="additional_shipping_cost" onchange="this.value = this.value.replace(/,/g, '.');" value="{$product->additional_shipping_cost|htmlentities}" />
+		<input type="text" id="additional_shipping_cost" name="additional_shipping_cost" onchange="this.value = this.value.replace(/,/g, '.');" value="{$product->additional_shipping_cost|htmlentities}" />
 	</div>
 </div>
 
 <div class="row">
-	<label class="control-label col-lg-5">
+	<label class="control-label col-lg-5" for="carriers_restriction">
 		<span class="label-tooltip" data-toggle="tooltip"
 			title="{l s='If no carrier selected, all carriers can be used to ship this product.'}">
 			{l s='Carriers:'}
diff --git a/classes/helper/Helper.php b/classes/helper/Helper.php
index 288ac4994..5d031f6ef 100755
--- a/classes/helper/Helper.php
+++ b/classes/helper/Helper.php
@@ -246,7 +246,7 @@ class HelperCore
 				<a class="btn btn-link" href="#" id="uncheck_all"><i class="icon-check-empty"></i> '.$translations['Uncheck All'].'</a>' : '')
 			.($use_search ? '
 				<div class="row">
-					<label class="control-label col-lg-6">'.$translations['search'].' :</label>
+					<label class="control-label col-lg-6" for="search_cat">'.$translations['search'].' :</label>
 					<div class="col-lg-6">
 						<input type="text" name="search_cat" id="search_cat"/>
 					</div>