diff --git a/core/lib/Thelia/Controller/Admin/CategoryController.php b/core/lib/Thelia/Controller/Admin/CategoryController.php
index fda94191c..4e798d683 100755
--- a/core/lib/Thelia/Controller/Admin/CategoryController.php
+++ b/core/lib/Thelia/Controller/Admin/CategoryController.php
@@ -89,7 +89,7 @@ class CategoryController extends BaseAdminController
             $categoryDeletionForm = new CategoryDeletionForm($this->getRequest());
 
             $data = $this->validateForm($categoryDeletionForm, "POST")->getData();
-var_dump($data);
+
             $categoryDeleteEvent = new CategoryDeleteEvent($data['category_id']);
 
             $this->dispatch(TheliaEvents::CATEGORY_DELETE, $categoryDeleteEvent);
@@ -151,8 +151,8 @@ var_dump($data);
     protected function positionDown($args)
     {
         $event = new CategoryChangePositionEvent(
-                $this->getRequest()->get('category_id', 0),
-                CategoryChangePositionEvent::POSITION_DOWN
+            $this->getRequest()->get('category_id', 0),
+            CategoryChangePositionEvent::POSITION_DOWN
         );
 
         $this->dispatch(TheliaEvents::CATEGORY_CHANGE_POSITION, $event);
diff --git a/core/lib/Thelia/Core/Template/Element/BaseLoop.php b/core/lib/Thelia/Core/Template/Element/BaseLoop.php
index 72f782309..8861022e9 100755
--- a/core/lib/Thelia/Core/Template/Element/BaseLoop.php
+++ b/core/lib/Thelia/Core/Template/Element/BaseLoop.php
@@ -28,6 +28,7 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Thelia\Core\Template\Loop\Argument\Argument;
 use Propel\Runtime\ActiveQuery\ModelCriteria;
 use Thelia\Core\Security\SecurityContext;
+use Thelia\Model\Tools\ModelCriteriaTools;
 
 /**
  *
@@ -234,6 +235,28 @@ abstract class BaseLoop
         }
     }
 
+    /**
+     * Setup ModelCriteria for proper i18n processing
+     *
+     * @param ModelCriteria $search the Propel Criteria to configure
+     * @param array $columns the i18n columns
+     * @param string $foreignTable the specified table (default  to criteria table)
+     * @param string $foreignKey the foreign key in this table (default to criteria table)
+     */
+    protected function configureI18nProcessing(ModelCriteria $search, $columns = array('TITLE', 'CHAPO', 'DESCRIPTION', 'POSTSCRIPTUM'), $foreignTable = null, $foreignKey = 'ID') {
+
+        /* manage translations */
+        ModelCriteriaTools::getI18n(
+            $this->getBackend_context(),
+            $this->getLang(),
+            $search,
+            $this->request->getSession()->getLocale(),
+            $columns,
+            $foreignTable,
+            $foreignKey
+        );
+    }
+
     /**
      *
      * this function have to be implement in your own loop class.
diff --git a/core/lib/Thelia/Core/Template/Loop/Attribute.php b/core/lib/Thelia/Core/Template/Loop/Attribute.php
index 41721350b..0608732a4 100755
--- a/core/lib/Thelia/Core/Template/Loop/Attribute.php
+++ b/core/lib/Thelia/Core/Template/Loop/Attribute.php
@@ -34,7 +34,6 @@ use Thelia\Core\Template\Loop\Argument\Argument;
 use Thelia\Log\Tlog;
 
 use Thelia\Model\Base\LangQuery;
-use Thelia\Model\Tools\ModelCriteriaTools;
 
 use Thelia\Model\Base\CategoryQuery;
 use Thelia\Model\Base\ProductCategoryQuery;
@@ -92,7 +91,7 @@ class Attribute extends BaseLoop
         $lang = $this->getLang();
 
         /* manage translations */
-        ModelCriteriaTools::getI18n($backendContext, $lang, $search, ConfigQuery::read("default_lang_without_translation", 1), $this->request->getSession()->getLocale());
+        $this->configureI18nProcessing($search);
 
         $id = $this->getId();
 
diff --git a/core/lib/Thelia/Core/Template/Loop/AttributeAvailability.php b/core/lib/Thelia/Core/Template/Loop/AttributeAvailability.php
index be42f5dab..0664c7d56 100755
--- a/core/lib/Thelia/Core/Template/Loop/AttributeAvailability.php
+++ b/core/lib/Thelia/Core/Template/Loop/AttributeAvailability.php
@@ -33,8 +33,6 @@ use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
 use Thelia\Log\Tlog;
 
-use Thelia\Model\Tools\ModelCriteriaTools;
-
 use Thelia\Model\Base\AttributeAvQuery;
 use Thelia\Model\ConfigQuery;
 use Thelia\Type\TypeCollection;
@@ -79,12 +77,8 @@ class AttributeAvailability extends BaseLoop
     {
         $search = AttributeAvQuery::create();
 
-        $backendContext = $this->getBackend_context();
-
-        $lang = $this->getLang();
-
         /* manage translations */
-        ModelCriteriaTools::getI18n($backendContext, $lang, $search, ConfigQuery::read("default_lang_without_translation", 1), $this->request->getSession()->getLocale());
+        $this->configureI18nProcessing($search);
 
         $id = $this->getId();
 
diff --git a/core/lib/Thelia/Core/Template/Loop/AttributeCombination.php b/core/lib/Thelia/Core/Template/Loop/AttributeCombination.php
index 833f1abb3..556a5a1fd 100755
--- a/core/lib/Thelia/Core/Template/Loop/AttributeCombination.php
+++ b/core/lib/Thelia/Core/Template/Loop/AttributeCombination.php
@@ -33,8 +33,6 @@ use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
 use Thelia\Log\Tlog;
 
-use Thelia\Model\Tools\ModelCriteriaTools;
-
 use Thelia\Model\Base\AttributeCombinationQuery;
 use Thelia\Model\Map\AttributeAvTableMap;
 use Thelia\Model\Map\AttributeTableMap;
@@ -59,6 +57,7 @@ class AttributeCombination extends BaseLoop
     {
         return new ArgumentCollection(
             Argument::createIntTypeArgument('product_sale_elements', null, true),
+            Argument::createIntTypeArgument('lang'),
             new Argument(
                 'order',
                 new TypeCollection(
@@ -79,20 +78,16 @@ class AttributeCombination extends BaseLoop
         $search = AttributeCombinationQuery::create();
 
         /* manage attribute translations */
-        ModelCriteriaTools::getFrontEndI18n(
+        $this->configureI18nProcessing(
             $search,
-            ConfigQuery::read("default_lang_without_translation", 1),
-            $this->request->getSession()->getLocale(),
             array('TITLE', 'CHAPO', 'DESCRIPTION', 'POSTSCRIPTUM'),
             AttributeTableMap::TABLE_NAME,
             'ATTRIBUTE_ID'
         );
 
         /* manage attributeAv translations */
-        ModelCriteriaTools::getFrontEndI18n(
+        $this->configureI18nProcessing(
             $search,
-            ConfigQuery::read("default_lang_without_translation", 1),
-            $this->request->getSession()->getLocale(),
             array('TITLE', 'CHAPO', 'DESCRIPTION', 'POSTSCRIPTUM'),
             AttributeAvTableMap::TABLE_NAME,
             'ATTRIBUTE_AV_ID'
diff --git a/core/lib/Thelia/Core/Template/Loop/Category.php b/core/lib/Thelia/Core/Template/Loop/Category.php
index 9b497bb1a..e01ce3df4 100755
--- a/core/lib/Thelia/Core/Template/Loop/Category.php
+++ b/core/lib/Thelia/Core/Template/Loop/Category.php
@@ -32,8 +32,6 @@ use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
 use Thelia\Log\Tlog;
 
-use Thelia\Model\Tools\ModelCriteriaTools;
-
 use Thelia\Model\CategoryQuery;
 use Thelia\Model\ConfigQuery;
 use Thelia\Type\TypeCollection;
@@ -98,12 +96,8 @@ class Category extends BaseLoop
     {
         $search = CategoryQuery::create();
 
-        $backendContext = $this->getBackend_context();
-
-        $lang = $this->getLang();
-
         /* manage translations */
-        ModelCriteriaTools::getI18n($backendContext, $lang, $search, ConfigQuery::read("default_lang_without_translation", 1), $this->request->getSession()->getLocale());
+        $this->configureI18nProcessing($search);
 
 		$id = $this->getId();
 
@@ -169,7 +163,6 @@ class Category extends BaseLoop
         $loopResult = new LoopResult();
 
         foreach ($categories as $category) {
-
             /*
              * no cause pagination lost :
              * if ($this->getNotEmpty() && $category->countAllProducts() == 0) continue;
diff --git a/core/lib/Thelia/Core/Template/Loop/CategoryPath.php b/core/lib/Thelia/Core/Template/Loop/CategoryPath.php
index d6c0cd02c..30238c26d 100755
--- a/core/lib/Thelia/Core/Template/Loop/CategoryPath.php
+++ b/core/lib/Thelia/Core/Template/Loop/CategoryPath.php
@@ -65,7 +65,8 @@ class CategoryPath extends BaseLoop
             Argument::createIntTypeArgument('category', null, true),
             Argument::createIntTypeArgument('depth'),
             Argument::createIntTypeArgument('level'),
-            Argument::createBooleanOrBothTypeArgument('visible', true, false)
+            Argument::createBooleanOrBothTypeArgument('visible', true, false),
+            Argument::createIntTypeArgument('lang')
         );
     }
 
@@ -80,6 +81,9 @@ class CategoryPath extends BaseLoop
         $visible = $this->getVisible();
 
         $search = CategoryQuery::create();
+
+        $this->configureI18nProcessing($search, array('TITLE'));
+
         $search->filterById($id);
         if ($visible != BooleanOrBothType::ANY) $search->filterByVisible($visible);
 
@@ -95,7 +99,7 @@ class CategoryPath extends BaseLoop
                 $loopResultRow = new LoopResultRow();
 
                 $loopResultRow
-                    ->set("TITLE",$category->getTitle())
+                    ->set("TITLE",$category->getVirtualColumn('i18n_TITLE'))
                     ->set("URL", $category->getUrl())
                     ->set("ID", $category->getId())
                 ;
@@ -114,8 +118,11 @@ class CategoryPath extends BaseLoop
                     $ids[] = $parent;
 
                     $search = CategoryQuery::create();
+
+                    $this->configureI18nProcessing($search, array('TITLE'));
+
                     $search->filterById($parent);
-                    if ($visible == true) $search->filterByVisible($visible);
+                    if ($visible != BooleanOrBothType::ANY) $search->filterByVisible($visible);
                 }
             }
         } while ($category != null && $parent > 0);
diff --git a/core/lib/Thelia/Core/Template/Loop/Content.php b/core/lib/Thelia/Core/Template/Loop/Content.php
index 6632a184c..701206ea8 100755
--- a/core/lib/Thelia/Core/Template/Loop/Content.php
+++ b/core/lib/Thelia/Core/Template/Loop/Content.php
@@ -31,8 +31,6 @@ use Thelia\Core\Template\Element\LoopResultRow;
 use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
 
-use Thelia\Model\Tools\ModelCriteriaTools;
-
 use Thelia\Model\FolderQuery;
 use Thelia\Model\Map\ContentTableMap;
 use Thelia\Model\ContentFolderQuery;
@@ -88,12 +86,8 @@ class Content extends BaseLoop
     {
         $search = ContentQuery::create();
 
-        $backendContext = $this->getBackend_context();
-
-        $lang = $this->getLang();
-
         /* manage translations */
-        ModelCriteriaTools::getI18n($backendContext, $lang, $search, ConfigQuery::read("default_lang_without_translation", 1), $this->request->getSession()->getLocale());
+        $this->configureI18nProcessing($search);
 
         $id = $this->getId();
 
diff --git a/core/lib/Thelia/Core/Template/Loop/Country.php b/core/lib/Thelia/Core/Template/Loop/Country.php
index c6f7d16de..d93d94cb4 100755
--- a/core/lib/Thelia/Core/Template/Loop/Country.php
+++ b/core/lib/Thelia/Core/Template/Loop/Country.php
@@ -31,8 +31,6 @@ use Thelia\Core\Template\Element\LoopResultRow;
 use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
 
-use Thelia\Model\Tools\ModelCriteriaTools;
-
 use Thelia\Model\CountryQuery;
 use Thelia\Model\ConfigQuery;
 
@@ -70,12 +68,8 @@ class Country extends BaseLoop
     {
         $search = CountryQuery::create();
 
-        $backendContext = $this->getBackend_context();
-
-        $lang = $this->getLang();
-
         /* manage translations */
-        ModelCriteriaTools::getI18n($backendContext, $lang, $search, ConfigQuery::read("default_lang_without_translation", 1), $this->request->getSession()->getLocale());
+        $this->configureI18nProcessing($search);
 
         $id = $this->getId();
 
diff --git a/core/lib/Thelia/Core/Template/Loop/Currency.php b/core/lib/Thelia/Core/Template/Loop/Currency.php
index d833ff8ae..b793b86fd 100755
--- a/core/lib/Thelia/Core/Template/Loop/Currency.php
+++ b/core/lib/Thelia/Core/Template/Loop/Currency.php
@@ -31,8 +31,6 @@ use Thelia\Core\Template\Element\LoopResultRow;
 use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
 
-use Thelia\Model\Tools\ModelCriteriaTools;
-
 use Thelia\Model\CurrencyQuery;
 use Thelia\Model\ConfigQuery;
 
@@ -69,12 +67,8 @@ class Currency extends BaseLoop
     {
         $search = CurrencyQuery::create();
 
-        $backendContext = $this->getBackend_context();
-
-        $lang = $this->getLang();
-
         /* manage translations */
-        ModelCriteriaTools::getI18n($backendContext, $lang, $search, ConfigQuery::read("default_lang_without_translation", 1), $this->request->getSession()->getLocale(), array('NAME'));
+        $this->configureI18nProcessing($search, array('NAME'));
 
         $id = $this->getId();
 
diff --git a/core/lib/Thelia/Core/Template/Loop/Feature.php b/core/lib/Thelia/Core/Template/Loop/Feature.php
index 85d037080..e2de85dbc 100755
--- a/core/lib/Thelia/Core/Template/Loop/Feature.php
+++ b/core/lib/Thelia/Core/Template/Loop/Feature.php
@@ -31,8 +31,6 @@ use Thelia\Core\Template\Element\LoopResultRow;
 use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
 
-use Thelia\Model\Tools\ModelCriteriaTools;
-
 use Thelia\Model\Base\CategoryQuery;
 use Thelia\Model\Base\ProductCategoryQuery;
 use Thelia\Model\Base\FeatureQuery;
@@ -84,12 +82,8 @@ class Feature extends BaseLoop
     {
         $search = FeatureQuery::create();
 
-        $backendContext = $this->getBackend_context();
-
-        $lang = $this->getLang();
-
         /* manage translations */
-        ModelCriteriaTools::getI18n($backendContext, $lang, $search, ConfigQuery::read("default_lang_without_translation", 1), $this->request->getSession()->getLocale());
+        $this->configureI18nProcessing($search);
 
         $id = $this->getId();
 
diff --git a/core/lib/Thelia/Core/Template/Loop/FeatureAvailability.php b/core/lib/Thelia/Core/Template/Loop/FeatureAvailability.php
index ce6f8767a..c04d70031 100755
--- a/core/lib/Thelia/Core/Template/Loop/FeatureAvailability.php
+++ b/core/lib/Thelia/Core/Template/Loop/FeatureAvailability.php
@@ -31,8 +31,6 @@ use Thelia\Core\Template\Element\LoopResultRow;
 use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
 
-use Thelia\Model\Tools\ModelCriteriaTools;
-
 use Thelia\Model\Base\FeatureAvQuery;
 use Thelia\Model\ConfigQuery;
 use Thelia\Type\TypeCollection;
@@ -77,12 +75,8 @@ class FeatureAvailability extends BaseLoop
     {
         $search = FeatureAvQuery::create();
 
-        $backendContext = $this->getBackend_context();
-
-        $lang = $this->getLang();
-
         /* manage translations */
-        ModelCriteriaTools::getI18n($backendContext, $lang, $search, ConfigQuery::read("default_lang_without_translation", 1), $this->request->getSession()->getLocale());
+        $this->configureI18nProcessing($search);
 
         $id = $this->getId();
 
diff --git a/core/lib/Thelia/Core/Template/Loop/FeatureValue.php b/core/lib/Thelia/Core/Template/Loop/FeatureValue.php
index 8a29d7c74..42d50c57b 100755
--- a/core/lib/Thelia/Core/Template/Loop/FeatureValue.php
+++ b/core/lib/Thelia/Core/Template/Loop/FeatureValue.php
@@ -33,8 +33,6 @@ use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
 use Thelia\Log\Tlog;
 
-use Thelia\Model\Tools\ModelCriteriaTools;
-
 use Thelia\Model\Base\FeatureProductQuery;
 use Thelia\Model\ConfigQuery;
 use Thelia\Model\Map\FeatureAvTableMap;
@@ -70,7 +68,8 @@ class FeatureValue extends BaseLoop
                     new Type\EnumListType(array('alpha', 'alpha_reverse', 'manual', 'manual_reverse'))
                 ),
                 'manual'
-            )
+            ),
+            Argument::createIntTypeArgument('lang')
         );
     }
 
@@ -84,10 +83,8 @@ class FeatureValue extends BaseLoop
         $search = FeatureProductQuery::create();
 
         /* manage featureAv translations */
-        ModelCriteriaTools::getFrontEndI18n(
+        $this->configureI18nProcessing(
             $search,
-            ConfigQuery::read("default_lang_without_translation", 1),
-            $this->request->getSession()->getLocale(),
             array('TITLE', 'CHAPO', 'DESCRIPTION', 'POSTSCRIPTUM'),
             FeatureAvTableMap::TABLE_NAME,
             'FEATURE_AV_ID'
diff --git a/core/lib/Thelia/Core/Template/Loop/Folder.php b/core/lib/Thelia/Core/Template/Loop/Folder.php
index c95b0dc42..327ce76d4 100755
--- a/core/lib/Thelia/Core/Template/Loop/Folder.php
+++ b/core/lib/Thelia/Core/Template/Loop/Folder.php
@@ -32,8 +32,6 @@ use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
 use Thelia\Log\Tlog;
 
-use Thelia\Model\Tools\ModelCriteriaTools;
-
 use Thelia\Model\FolderQuery;
 use Thelia\Model\ConfigQuery;
 use Thelia\Type\TypeCollection;
@@ -80,12 +78,8 @@ class Folder extends BaseLoop
     {
         $search = FolderQuery::create();
 
-        $backendContext = $this->getBackend_context();
-
-        $lang = $this->getLang();
-
         /* manage translations */
-        ModelCriteriaTools::getI18n($backendContext, $lang, $search, ConfigQuery::read("default_lang_without_translation", 1), $this->request->getSession()->getLocale());
+        $this->configureI18nProcessing($search);
 
 		$id = $this->getId();
 
diff --git a/core/lib/Thelia/Core/Template/Loop/Image.php b/core/lib/Thelia/Core/Template/Loop/Image.php
index a1e866cb2..638905dc2 100755
--- a/core/lib/Thelia/Core/Template/Loop/Image.php
+++ b/core/lib/Thelia/Core/Template/Loop/Image.php
@@ -207,16 +207,8 @@ class Image extends BaseLoop
 
         }
 
-        /**
-         * \Criteria::INNER_JOIN in second parameter for joinWithI18n  exclude query without translation.
-         *
-         * @todo : verify here if we want results for row without translations.
-         */
-
-        $search->joinWithI18n(
-                $this->request->getSession()->getLocale(),
-                (ConfigQuery::read("default_lang_without_translation", 1)) ? Criteria::LEFT_JOIN : Criteria::INNER_JOIN
-        );
+        /* manage translations */
+        $this->configureI18nProcessing($search);
 
         $results = $this->search($search, $pagination);
 
@@ -295,6 +287,7 @@ class Image extends BaseLoop
                     ),
                     'manual'
             ),
+            Argument::createIntTypeArgument('lang'),
 
             Argument::createIntTypeArgument('width'),
             Argument::createIntTypeArgument('height'),
diff --git a/core/lib/Thelia/Core/Template/Loop/Product.php b/core/lib/Thelia/Core/Template/Loop/Product.php
index 10112ef28..1570acca8 100755
--- a/core/lib/Thelia/Core/Template/Loop/Product.php
+++ b/core/lib/Thelia/Core/Template/Loop/Product.php
@@ -33,8 +33,6 @@ use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
 use Thelia\Log\Tlog;
 
-use Thelia\Model\Tools\ModelCriteriaTools;
-
 use Thelia\Model\CategoryQuery;
 use Thelia\Model\Map\FeatureProductTableMap;
 use Thelia\Model\Map\ProductPriceTableMap;
@@ -138,12 +136,8 @@ class Product extends BaseLoop
     {
         $search = ProductQuery::create();
 
-        $backendContext = $this->getBackend_context();
-
-        $lang = $this->getLang();
-
         /* manage translations */
-        ModelCriteriaTools::getI18n($backendContext, $lang, $search, ConfigQuery::read("default_lang_without_translation", 1), $this->request->getSession()->getLocale());
+        $this->configureI18nProcessing($search);
 
         $attributeNonStrictMatch = $this->getAttribute_non_strict_match();
         $isPSELeftJoinList = array();
diff --git a/core/lib/Thelia/Core/Template/Loop/Title.php b/core/lib/Thelia/Core/Template/Loop/Title.php
index caa5e7d87..c53be086a 100755
--- a/core/lib/Thelia/Core/Template/Loop/Title.php
+++ b/core/lib/Thelia/Core/Template/Loop/Title.php
@@ -31,8 +31,6 @@ use Thelia\Core\Template\Element\LoopResultRow;
 use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
 use Thelia\Core\Template\Loop\Argument\Argument;
 
-use Thelia\Model\Tools\ModelCriteriaTools;
-
 use Thelia\Model\CustomerTitleQuery;
 use Thelia\Model\ConfigQuery;
 
@@ -67,12 +65,8 @@ class Title extends BaseLoop
     {
         $search = CustomerTitleQuery::create();
 
-        $backendContext = $this->getBackend_context();
-
-        $lang = $this->getLang();
-
         /* manage translations */
-        ModelCriteriaTools::getI18n($backendContext, $lang, $search, ConfigQuery::read("default_lang_without_translation", 1), $this->request->getSession()->getLocale(), array('SHORT', 'LONG'));
+        $this->configureI18nProcessing($search, array('SHORT', 'LONG'));
 
         $id = $this->getId();
 
diff --git a/core/lib/Thelia/Model/Category.php b/core/lib/Thelia/Model/Category.php
index 88e7cfc10..2ffd375dd 100755
--- a/core/lib/Thelia/Model/Category.php
+++ b/core/lib/Thelia/Model/Category.php
@@ -48,7 +48,7 @@ class Category extends BaseCategory
 			->findOne()
 		;
 
-		return $last->getPosition() + 1;
+		return $last != null ? $last->getPosition() + 1 : 1;
      }
 
     /**
@@ -74,6 +74,4 @@ class Category extends BaseCategory
         return $countProduct;
 
     }
-
-
-}
+}
\ No newline at end of file
diff --git a/core/lib/Thelia/Model/Tools/ModelCriteriaTools.php b/core/lib/Thelia/Model/Tools/ModelCriteriaTools.php
index e9323ebfa..3913b2890 100755
--- a/core/lib/Thelia/Model/Tools/ModelCriteriaTools.php
+++ b/core/lib/Thelia/Model/Tools/ModelCriteriaTools.php
@@ -6,6 +6,7 @@ use Propel\Runtime\ActiveQuery\Criteria;
 use Propel\Runtime\ActiveQuery\Join;
 use Propel\Runtime\ActiveQuery\ModelCriteria;
 use Thelia\Model\Base\LangQuery;
+use Thelia\Model\ConfigQuery;
 
 /**
  * Class ModelCriteriaTools
@@ -17,13 +18,12 @@ class ModelCriteriaTools
 {
     /**
      * @param ModelCriteria $search
-     * @param               $defaultLangWithoutTranslation
-     * @param               $askedLocale
+     * @param               $requestedLocale
      * @param array         $columns
      * @param null          $foreignTable
      * @param string        $foreignKey
      */
-    public static function getFrontEndI18n(ModelCriteria &$search, $defaultLangWithoutTranslation, $askedLocale, $columns = array('TITLE', 'CHAPO', 'DESCRIPTION', 'POSTSCRIPTUM'), $foreignTable = null, $foreignKey = 'ID')
+    public static function getFrontEndI18n(ModelCriteria &$search, $requestedLocale, $columns, $foreignTable, $foreignKey)
     {
         if($foreignTable === null) {
             $foreignTable = $search->getTableMap()->getName();
@@ -32,21 +32,24 @@ class ModelCriteriaTools
             $aliasPrefix = $foreignTable . '_';
         }
 
-        $askedLocaleI18nAlias = 'asked_locale_i18n';
+        $defaultLangWithoutTranslation = ConfigQuery::read("default_lang_without_translation", 1);
+
+        $requestedLocaleI18nAlias = 'requested_locale_i18n';
         $defaultLocaleI18nAlias = 'default_locale_i18n';
 
-        if($defaultLangWithoutTranslation == 0) {
-            $askedLocaleJoin = new Join();
-            $askedLocaleJoin->addExplicitCondition($search->getTableMap()->getName(), $foreignKey, null, $foreignTable . '_i18n', 'ID', $askedLocaleI18nAlias);
-            $askedLocaleJoin->setJoinType(Criteria::INNER_JOIN);
+        if (!$defaultLangWithoutTranslation == 0) {
 
-            $search->addJoinObject($askedLocaleJoin, $askedLocaleI18nAlias)
-                ->addJoinCondition($askedLocaleI18nAlias ,'`' . $askedLocaleI18nAlias . '`.LOCALE = ?', $askedLocale, null, \PDO::PARAM_STR);
+            $requestedLocaleJoin = new Join();
+            $requestedLocaleJoin->addExplicitCondition($search->getTableMap()->getName(), $foreignKey, null, $foreignTable . '_i18n', 'ID', $requestedLocaleI18nAlias);
+            $requestedLocaleJoin->setJoinType(Criteria::INNER_JOIN);
 
-            $search->withColumn('NOT ISNULL(`' . $askedLocaleI18nAlias . '`.`ID`)', $aliasPrefix . 'IS_TRANSLATED');
+            $search->addJoinObject($requestedLocaleJoin, $requestedLocaleI18nAlias)
+                ->addJoinCondition($requestedLocaleI18nAlias ,'`' . $requestedLocaleI18nAlias . '`.LOCALE = ?', $requestedLocale, null, \PDO::PARAM_STR);
+
+            $search->withColumn('NOT ISNULL(`' . $requestedLocaleI18nAlias . '`.`ID`)', $aliasPrefix . 'IS_TRANSLATED');
 
             foreach($columns as $column) {
-                $search->withColumn('`' . $askedLocaleI18nAlias . '`.`' . $column . '`', $aliasPrefix . 'i18n_' . $column);
+                $search->withColumn('`' . $requestedLocaleI18nAlias . '`.`' . $column . '`', $aliasPrefix . 'i18n_' . $column);
             }
         } else {
             $defaultLocale = LangQuery::create()->findOneById($defaultLangWithoutTranslation)->getLocale();
@@ -58,24 +61,24 @@ class ModelCriteriaTools
             $search->addJoinObject($defaultLocaleJoin, $defaultLocaleI18nAlias)
                 ->addJoinCondition($defaultLocaleI18nAlias ,'`' . $defaultLocaleI18nAlias . '`.LOCALE = ?', $defaultLocale, null, \PDO::PARAM_STR);
 
-            $askedLocaleJoin = new Join();
-            $askedLocaleJoin->addExplicitCondition($search->getTableMap()->getName(), $foreignKey, null, $foreignTable . '_i18n', 'ID', $askedLocaleI18nAlias);
-            $askedLocaleJoin->setJoinType(Criteria::LEFT_JOIN);
+            $requestedLocaleJoin = new Join();
+            $requestedLocaleJoin->addExplicitCondition($search->getTableMap()->getName(), $foreignKey, null, $foreignTable . '_i18n', 'ID', $requestedLocaleI18nAlias);
+            $requestedLocaleJoin->setJoinType(Criteria::LEFT_JOIN);
 
-            $search->addJoinObject($askedLocaleJoin, $askedLocaleI18nAlias)
-                ->addJoinCondition($askedLocaleI18nAlias ,'`' . $askedLocaleI18nAlias . '`.LOCALE = ?', $askedLocale, null, \PDO::PARAM_STR);
+            $search->addJoinObject($requestedLocaleJoin, $requestedLocaleI18nAlias)
+                ->addJoinCondition($requestedLocaleI18nAlias ,'`' . $requestedLocaleI18nAlias . '`.LOCALE = ?', $requestedLocale, null, \PDO::PARAM_STR);
 
-            $search->withColumn('NOT ISNULL(`' . $askedLocaleI18nAlias . '`.`ID`)', $aliasPrefix . 'IS_TRANSLATED');
+            $search->withColumn('NOT ISNULL(`' . $requestedLocaleI18nAlias . '`.`ID`)', $aliasPrefix . 'IS_TRANSLATED');
 
-            $search->where('NOT ISNULL(`' . $askedLocaleI18nAlias . '`.ID)')->_or()->where('NOT ISNULL(`' . $defaultLocaleI18nAlias . '`.ID)');
+            $search->where('NOT ISNULL(`' . $requestedLocaleI18nAlias . '`.ID)')->_or()->where('NOT ISNULL(`' . $defaultLocaleI18nAlias . '`.ID)');
 
             foreach($columns as $column) {
-                $search->withColumn('CASE WHEN NOT ISNULL(`' . $askedLocaleI18nAlias . '`.ID) THEN `' . $askedLocaleI18nAlias . '`.`' . $column . '` ELSE `' . $defaultLocaleI18nAlias . '`.`' . $column . '` END', $aliasPrefix . 'i18n_' . $column);
+                $search->withColumn('CASE WHEN NOT ISNULL(`' . $requestedLocaleI18nAlias . '`.ID) THEN `' . $requestedLocaleI18nAlias . '`.`' . $column . '` ELSE `' . $defaultLocaleI18nAlias . '`.`' . $column . '` END', $aliasPrefix . 'i18n_' . $column);
             }
         }
     }
 
-    public static function getBackEndI18n(ModelCriteria &$search, $askedLocale, $columns = array('TITLE', 'CHAPO', 'DESCRIPTION', 'POSTSCRIPTUM'), $foreignTable = null, $foreignKey = 'ID')
+    public static function getBackEndI18n(ModelCriteria &$search, $requestedLocale, $columns, $foreignTable, $foreignKey)
     {
         if($foreignTable === null) {
             $foreignTable = $search->getTableMap()->getName();
@@ -84,35 +87,44 @@ class ModelCriteriaTools
             $aliasPrefix = $foreignTable . '_';
         }
 
-        $askedLocaleI18nAlias = 'asked_locale_i18n';
+        $requestedLocaleI18nAlias = 'requested_locale_i18n';
 
-        $askedLocaleJoin = new Join();
-        $askedLocaleJoin->addExplicitCondition($search->getTableMap()->getName(), $foreignKey, null, $foreignTable . '_i18n', 'ID', $askedLocaleI18nAlias);
-        $askedLocaleJoin->setJoinType(Criteria::LEFT_JOIN);
+        $requestedLocaleJoin = new Join();
+        $requestedLocaleJoin->addExplicitCondition($search->getTableMap()->getName(), $foreignKey, null, $foreignTable . '_i18n', 'ID', $requestedLocaleI18nAlias);
+        $requestedLocaleJoin->setJoinType(Criteria::LEFT_JOIN);
 
-        $search->addJoinObject($askedLocaleJoin, $askedLocaleI18nAlias)
-            ->addJoinCondition($askedLocaleI18nAlias ,'`' . $askedLocaleI18nAlias . '`.LOCALE = ?', $askedLocale, null, \PDO::PARAM_STR);
+        $search->addJoinObject($requestedLocaleJoin, $requestedLocaleI18nAlias)
+            ->addJoinCondition($requestedLocaleI18nAlias ,'`' . $requestedLocaleI18nAlias . '`.LOCALE = ?', $requestedLocale, null, \PDO::PARAM_STR);
 
-        $search->withColumn('NOT ISNULL(`' . $askedLocaleI18nAlias . '`.`ID`)', $aliasPrefix . 'IS_TRANSLATED');
+        $search->withColumn('NOT ISNULL(`' . $requestedLocaleI18nAlias . '`.`ID`)', $aliasPrefix . 'IS_TRANSLATED');
 
         foreach($columns as $column) {
-            $search->withColumn('`' . $askedLocaleI18nAlias . '`.`' . $column . '`', $aliasPrefix . 'i18n_' . $column);
+            $search->withColumn('`' . $requestedLocaleI18nAlias . '`.`' . $column . '`', $aliasPrefix . 'i18n_' . $column);
         }
     }
 
-    public static function getI18n($backendContext, $lang, ModelCriteria &$search, $defaultLangWithoutTranslation, $currentLocale, $columns = array('TITLE', 'CHAPO', 'DESCRIPTION', 'POSTSCRIPTUM'), $foreignTable = null, $foreignKey = 'ID')
+    public static function getI18n($backendContext, $requestedLangId, ModelCriteria &$search, $currentLocale, $columns, $foreignTable, $foreignKey)
     {
-        if($lang !== null) {
-            $localeSearch = LangQuery::create()->findOneById($lang);
-            if($localeSearch === null) {
-                throw new \InvalidArgumentException('Incorrect lang argument given in attribute loop');
+        // If a lang has been requested, find the related Lang object, and get the locale
+        if ($requestedLangId !== null) {
+            $localeSearch = LangQuery::create()->findOneById($requestedLangId);
+
+            if ($localeSearch === null) {
+                throw new \InvalidArgumentException(sprintf('Incorrect lang argument given in attribute loop: lang ID %d not found', $requestedLangId));
             }
+
+            $locale = $localeSearch->getLocale();
+        }
+        else {
+            // Use the currently defined locale
+            $locale = $currentLocale;
         }
 
-        if($backendContext) {
-            self::getBackEndI18n($search, $lang === null ? $currentLocale : $localeSearch->getLocale(), $columns, $foreignTable, $foreignKey);
+        // Call the proper method depending on the context: front or back
+        if ($backendContext) {
+            self::getBackEndI18n($search, $locale, $columns, $foreignTable, $foreignKey);
         } else {
-            self::getFrontEndI18n($search, $defaultLangWithoutTranslation, $lang === null ? $currentLocale : $localeSearch->getLocale(), $columns, $foreignTable, $foreignKey);
+            self::getFrontEndI18n($search, $locale, $columns, $foreignTable, $foreignKey);
         }
     }
 }
diff --git a/templates/admin/default/assets/bootstrap-editable/css/bootstrap-editable.css b/templates/admin/default/assets/bootstrap-editable/css/bootstrap-editable.css
index 2d9cc4eae..16de488fa 100755
--- a/templates/admin/default/assets/bootstrap-editable/css/bootstrap-editable.css
+++ b/templates/admin/default/assets/bootstrap-editable/css/bootstrap-editable.css
@@ -1,4 +1,4 @@
-/*! X-editable - v1.4.6 
+/*! X-editable - v1.4.6
 * In-place editing with Twitter Bootstrap, jQuery UI or pure jQuery
 * http://github.com/vitalets/x-editable
 * Copyright (c) 2013 Vitaliy Potapov; Licensed MIT */
@@ -18,45 +18,45 @@
    vertical-align: top;
    margin-left: 7px;
    /* inline-block emulation for IE7*/
-   zoom: 1; 
+   zoom: 1;
    *display: inline;
 }
 
 .editable-buttons.editable-buttons-bottom {
-   display: block; 
+   display: block;
    margin-top: 7px;
    margin-left: 0;
 }
 
 .editable-input {
-    vertical-align: top; 
+    vertical-align: top;
     display: inline-block; /* should be inline to take effect of parent's white-space: nowrap */
     width: auto; /* bootstrap-responsive has width: 100% that breakes layout */
     white-space: normal; /* reset white-space decalred in parent*/
    /* display-inline emulation for IE7*/
-   zoom: 1; 
-   *display: inline;   
+   zoom: 1;
+   *display: inline;
 }
 
 .editable-buttons .editable-cancel {
-   margin-left: 7px; 
+   margin-left: 7px;
 }
 
 /*for jquery-ui buttons need set height to look more pretty*/
 .editable-buttons button.ui-button-icon-only {
-   height: 24px; 
+   height: 24px;
    width: 30px;
 }
 
 .editableform-loading {
-    background: url('../img/loading.gif') center center no-repeat;  
+    background: url('../img/loading.gif') center center no-repeat;
     height: 25px;
-    width: auto; 
-    min-width: 25px; 
+    width: auto;
+    min-width: 25px;
 }
 
 .editable-inline .editableform-loading {
-    background-position: left 5px;      
+    background-position: left 5px;
 }
 
  .editable-error-block {
@@ -68,17 +68,17 @@
 
 /*add padding for jquery ui*/
 .editable-error-block.ui-state-error {
-    padding: 3px;  
-}  
+    padding: 3px;
+}
 
 .editable-error {
-   color: red;  
+   color: red;
 }
 
 /* ---- For specific types ---- */
 
 .editableform .editable-date {
-    padding: 0; 
+    padding: 0;
     margin: 0;
     float: left;
 }
@@ -86,25 +86,25 @@
 /* move datepicker icon to center of add-on button. See https://github.com/vitalets/x-editable/issues/183 */
 .editable-inline .add-on .icon-th {
    margin-top: 3px;
-   margin-left: 1px; 
+   margin-left: 1px;
 }
 
 
 /* checklist vertical alignment */
-.editable-checklist label input[type="checkbox"], 
+.editable-checklist label input[type="checkbox"],
 .editable-checklist label span {
     vertical-align: middle;
     margin: 0;
 }
 
 .editable-checklist label {
-    white-space: nowrap; 
+    white-space: nowrap;
 }
 
 /* set exact width of textarea to fit buttons toolbar */
 .editable-wysihtml5 {
-    width: 566px; 
-    height: 250px; 
+    width: 566px;
+    height: 250px;
 }
 
 /* clear button shown as link in date inputs */
@@ -119,16 +119,16 @@
 .editable-clear-x {
    background: url('../img/clear.png') center center no-repeat;
    display: block;
-   width: 13px;    
+   width: 13px;
    height: 13px;
    position: absolute;
    opacity: 0.6;
    z-index: 100;
-   
+
    top: 50%;
    right: 6px;
    margin-top: -6px;
-   
+
 }
 
 .editable-clear-x:hover {
@@ -140,49 +140,49 @@
 }
 .editable-container.editable-popup {
     max-width: none !important; /* without this rule poshytip/tooltip does not stretch */
-}  
+}
 
 .editable-container.popover {
     width: auto; /* without this rule popover does not stretch */
 }
 
 .editable-container.editable-inline {
-    display: inline-block; 
+    display: inline-block;
     vertical-align: middle;
     width: auto;
     /* inline-block emulation for IE7*/
-    zoom: 1; 
-    *display: inline;    
+    zoom: 1;
+    *display: inline;
 }
 
 .editable-container.ui-widget {
    font-size: inherit;  /* jqueryui widget font 1.1em too big, overwrite it */
    z-index: 9990; /* should be less than select2 dropdown z-index to close dropdown first when click */
 }
-.editable-click, 
-a.editable-click, 
+.editable-click,
+a.editable-click,
 a.editable-click:hover {
     text-decoration: none;
-    border-bottom: dashed 1px #0088cc;
+    border-bottom: dotted 1px #0088cc;
 }
 
-.editable-click.editable-disabled, 
-a.editable-click.editable-disabled, 
+.editable-click.editable-disabled,
+a.editable-click.editable-disabled,
 a.editable-click.editable-disabled:hover {
-   color: #585858;  
+   color: #585858;
    cursor: default;
    border-bottom: none;
 }
 
 .editable-empty, .editable-empty:hover, .editable-empty:focus{
-  font-style: italic; 
-  color: #DD1144;  
+  font-style: italic;
+  color: #DD1144;
   /* border-bottom: none; */
   text-decoration: none;
 }
 
 .editable-unsaved {
-  font-weight: bold; 
+  font-weight: bold;
 }
 
 .editable-unsaved:after {
@@ -194,12 +194,12 @@ a.editable-click.editable-disabled:hover {
   -moz-transition: background-color 1400ms ease-out;
   -o-transition: background-color 1400ms ease-out;
   -ms-transition: background-color 1400ms ease-out;
-  transition: background-color 1400ms ease-out;  
+  transition: background-color 1400ms ease-out;
 }
 
 /*see https://github.com/vitalets/x-editable/issues/139 */
 .form-horizontal .editable
-{ 
+{
     padding-top: 5px;
     display:inline-block;
 }
diff --git a/templates/admin/default/assets/css/admin.less b/templates/admin/default/assets/css/admin.less
index 0f1d499ce..9d9f2c482 100755
--- a/templates/admin/default/assets/css/admin.less
+++ b/templates/admin/default/assets/css/admin.less
@@ -717,10 +717,4 @@ label {
 		// Center the alert box (20px bottom margin) in the table cell
 		padding: 20px 20px 0 20px;
 	}
-}
-
-// -- Editable tweaks ---------------------------------------------------------
-
-.editable-click, a.editable-click, a.editable-click:hover {
-  border-bottom: 1px dotted #0088CC;
 }
\ No newline at end of file
diff --git a/templates/admin/default/categories.html b/templates/admin/default/categories.html
index e37018e02..7bf76988c 100755
--- a/templates/admin/default/categories.html
+++ b/templates/admin/default/categories.html
@@ -241,7 +241,7 @@ $(function() {
         $.ajax({
            url : "{url path='admin/catalog/category'}",
            data : {
-               id : $(this).data('id'),
+               category_id : $(this).data('id'),
                action : 'visibilityToggle'
            }
         });
diff --git a/templates/admin/default/includes/category_breadcrumb.html b/templates/admin/default/includes/category_breadcrumb.html
index 0870a4c2e..cf03c4082 100755
--- a/templates/admin/default/includes/category_breadcrumb.html
+++ b/templates/admin/default/includes/category_breadcrumb.html
@@ -12,11 +12,11 @@
                 {if $action == 'edit'}
                     {intl l='Editing %cat' cat="{$TITLE}"}
                 {else}
-                    {$TITLE} <a href="{url path="admin/catalog/category/edit/$ID"}" title="{intl l='Edit this category'}">{intl l="(edit)"}</a>
+                    {$TITLE} <a href="{url path='admin/catalog/category' id="$ID" action='edit'}" title="{intl l='Edit this category'}">{intl l="(edit)"}</a>
 				{/if}
     		</li>
     	{else}
-    		<li><a href="{url path="admin/catalog/category/browse/$ID"}">{$TITLE}</a> <span class="divider">/</span></li>
+    		<li><a href="{url path='admin/catalog/category' id="$ID" action='browse'}">{$TITLE}</a> <span class="divider">/</span></li>
     	{/if}
     {/loop}
 {/ifloop}
diff --git a/templates/admin/default/includes/inner-form-toolbar.html b/templates/admin/default/includes/inner-form-toolbar.html
index 8d6f65cc8..4d5570f6c 100755
--- a/templates/admin/default/includes/inner-form-toolbar.html
+++ b/templates/admin/default/includes/inner-form-toolbar.html
@@ -12,7 +12,7 @@
 		<ul class="nav nav-pills">
 		    {loop name="lang_list" type="lang" default_only={$default_only}}
 		    <li {if $IS_DEFAULT}class="active"{/if}>
-		        <a href="#"  title="{intl l="Edit information for %lng" lng=$TITLE}">
+		        <a href="#"  title="{intl l="Edit information in %lng" lng=$TITLE}">
 		            <img src="{image file="../assets/img/flags/{$CODE}.gif"}" alt="{intl l=$TITLE}" />
 		         </a>
 		    </li>