diff --git a/adm/helpers/HelperFormBootstrap.php b/adm/helpers/HelperFormBootstrap.php
index 9592e0d3..e1040e9c 100644
--- a/adm/helpers/HelperFormBootstrap.php
+++ b/adm/helpers/HelperFormBootstrap.php
@@ -703,8 +703,8 @@ class HelperFormBootstrap{
             <label class="control-label ' . (isset($p['label-class']) && $p['label-class'] ? $p['label-class'] : '') . '">'.$p['label'].' </label>
             <div class="' . (isset($p['input-class']) && $p['input-class'] ? $p['input-class'] : '') . '">';
                 foreach($p['options'] as $key => $option) {
-                    $this->_html .= '<label class="radio-inline" for="'.$p['name'].'_'.$key.'">
-                        <input type="radio" name="'.$p['name'].'" value="'.$option['value'].'" id="'.$p['name'] . '_' . $opt['value'].'"'.($option['checked']? ' checked="checked"' : '').' /> '.(isset($option['label']) && $option['label'] ?$option['label']:'').'
+                    $this->_html .= '<label class="radio-inline" for="'.$p['name'].'_' . $option['value'].'">
+                        <input type="radio" name="'.$p['name'].'" value="'.$option['value'].'" id="'.$p['name'] . '_' . $option['value'].'"'.($option['checked']? ' checked="checked"' : '').' /> '.(isset($option['label']) && $option['label'] ?$option['label']:'').'
                     </label>';
                 }
             $this->_html .= '<div class="clearfix"></div>
diff --git a/modules/bulkupdate/AdminBulkUpdate.php b/modules/bulkupdate/AdminBulkUpdate.php
index 1da9414d..21477042 100644
--- a/modules/bulkupdate/AdminBulkUpdate.php
+++ b/modules/bulkupdate/AdminBulkUpdate.php
@@ -1248,7 +1248,7 @@ class AdminBulkUpdate extends AdminTab {
                 $products = array_unique($products);
 
                 $privatesale = Sale::getSaleFromCategory((int) $id_category);
-                $fname = date( "Ymd", strtotime($privatesale->date_start)).'-'.$privatesale->title[(int)$id_lang].'.csv';
+                $fname = date( "Ymd", strtotime($privatesale->date_start)).'-'.$privatesale->title[(int)$id_lang].'-'.$id_category.'.csv';
                 foreach(glob(dirname(__FILE__).'/*.csv') as $filename) {
                     if ($fname == $filename) {
                         unlink($filename);
diff --git a/modules/labelgenerate/models/generatebarcode.php b/modules/labelgenerate/models/generatebarcode.php
index a77426dd..795de8cd 100644
--- a/modules/labelgenerate/models/generatebarcode.php
+++ b/modules/labelgenerate/models/generatebarcode.php
@@ -130,7 +130,7 @@ class GenerateBarcode {
             for ($i=1; $i <= $quantity; $i++) {
                 $this->products[] = array(
                     'key' => ($id_product.'-'.$id_product_attribute),
-                    'label' => ($name_combination . ' ' . $p['name']),
+                    'label' => substr(($name_combination . ' ' . $p['name']),0,28),
                     'ref' => $ref,
                     'decli' => substr($name_combination,0,-1)
                 );
diff --git a/modules/privatesales_logistique/AdminPrivateSalesLogistique.php b/modules/privatesales_logistique/AdminPrivateSalesLogistique.php
index 21a80daa..3ec20970 100755
--- a/modules/privatesales_logistique/AdminPrivateSalesLogistique.php
+++ b/modules/privatesales_logistique/AdminPrivateSalesLogistique.php
@@ -970,7 +970,7 @@ class AdminPrivateSalesLogistique extends AdminTab {
             }
             $products = array_unique($products);
 
-            $fname = date( "Ymd", strtotime($sale->date_start)).'-'.$sale->title[(int)$id_lang].'.csv';
+            $fname = date( "Ymd", strtotime($sale->date_start)).'-'.$sale->title[(int)$id_lang].'-'.$id_category.'.csv';
             foreach(glob(dirname(__FILE__).'/*.csv') as $filename) {
                 if ($fname == $filename) {
                     unlink($filename);
diff --git a/themes/site/order-address.tpl b/themes/site/order-address.tpl
index fcafc4a3..584ad674 100755
--- a/themes/site/order-address.tpl
+++ b/themes/site/order-address.tpl
@@ -190,7 +190,7 @@
 		</ol>
 	</div>
 {/if}
-<form action="{$link->getPageLink($back_order_page, true)}" method="post">
+<form action="{$link->getPageLink($back_order_page, true)}?step=2" method="post">
 {else}
 <h2>1. {l s='Addresses'}</h2>
 <div id="opc_account" class="opc-main-block">
diff --git a/themes/site/order-carrier.tpl b/themes/site/order-carrier.tpl
index 9deecd2f..d5dfb782 100755
--- a/themes/site/order-carrier.tpl
+++ b/themes/site/order-carrier.tpl
@@ -93,7 +93,7 @@
 
 {include file="$tpl_dir./errors.tpl"}
 
-<form id="form" action="{$link->getPageLink('order.php', true)}" method="post" onsubmit="return submitCarrier(); return ((window.ga && ga.create)? !ga.loaded : true);">
+<form id="form" action="{$link->getPageLink('order.php', true)}?step=3" method="post" onsubmit="return submitCarrier(); return ((window.ga && ga.create)? !ga.loaded : true);">
 {else}
 <h2>2. {l s='Delivery methods'}</h2>
 <div id="opc_delivery_methods" class="opc-main-block">
diff --git a/themes/site_mobile/order-address.tpl b/themes/site_mobile/order-address.tpl
index bee9ae19..8e033f4d 100755
--- a/themes/site_mobile/order-address.tpl
+++ b/themes/site_mobile/order-address.tpl
@@ -188,7 +188,7 @@
 		</ol>
 	</div>
 {/if}
-<form action="{$link->getPageLink($back_order_page, true)}" method="post" class="form_address">
+<form action="{$link->getPageLink($back_order_page, true)}?step=2" method="post" class="form_address">
 {else}
 <h2>1. {l s='Addresses'}</h2>
 <div id="opc_account" class="opc-main-block">
diff --git a/themes/site_mobile/order-carrier.tpl b/themes/site_mobile/order-carrier.tpl
index aa2220fc..639998bb 100755
--- a/themes/site_mobile/order-carrier.tpl
+++ b/themes/site_mobile/order-carrier.tpl
@@ -90,7 +90,7 @@
 
 {include file="$tpl_dir./errors.tpl"}
 
-<form id="form" action="{$link->getPageLink('order.php', true)}" method="post" onsubmit="return submitCarrier(); return ((window.ga && ga.create)? !ga.loaded : true);">
+<form id="form" action="{$link->getPageLink('order.php', true)}?step=3" method="post" onsubmit="return submitCarrier(); return ((window.ga && ga.create)? !ga.loaded : true);">
 {else}
 <h2>2. {l s='Delivery methods'}</h2>
 <div id="opc_delivery_methods" class="opc-main-block">