diff --git a/Admin/Installer.php b/Admin/Installer.php
index df9b630..d86ca99 100755
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -117,7 +117,7 @@ final class Installer extends InstallerAbstract
 
             $module->apiStockTypeCreate($request, $response);
 
-            $responseData = $response->get('');
+            $responseData = $response->getData('');
             if (!\is_array($responseData)) {
                 continue;
             }
diff --git a/Controller/ApiAttributeController.php b/Controller/ApiAttributeController.php
index aec55f4..0d4d477 100644
--- a/Controller/ApiAttributeController.php
+++ b/Controller/ApiAttributeController.php
@@ -82,11 +82,11 @@ final class ApiAttributeController extends Controller
         $attribute->ref  = (int) $request->getData('ref');
         $attribute->type = new NullAttributeType((int) $request->getData('type'));
 
-        if ($request->hasData('value')) {
-            $attribute->value = new NullAttributeValue((int) $request->getData('value'));
+        if ($request->hasData('value_id')) {
+            $attribute->value = new NullAttributeValue((int) $request->getData('value_id'));
         } else {
             $newRequest = clone $request;
-            $newRequest->setData('value', $request->getData('custom'), true);
+            $newRequest->setData('value', $request->getData('value'), true);
 
             $value = $this->createLotAttributeValueFromRequest($newRequest);
 
@@ -109,7 +109,7 @@ final class ApiAttributeController extends Controller
     {
         $val = [];
         if (($val['type'] = !$request->hasData('type'))
-            || ($val['value'] = (!$request->hasData('value') && !$request->hasData('custom')))
+            || ($val['value'] = (!$request->hasData('value') && !$request->hasData('value_id')))
             || ($val['lot'] = !$request->hasData('lot'))
         ) {
             return $val;
diff --git a/Theme/Backend/Lang/ar.lang.php b/Theme/Backend/Lang/ar.lang.php
index e77dbce..6a62e89 100755
--- a/Theme/Backend/Lang/ar.lang.php
+++ b/Theme/Backend/Lang/ar.lang.php
@@ -29,7 +29,7 @@ return ['WarehouseManagement' => [
     'Localization'  => '',
     'Localizations' => '',
     'Location'      => 'موقع',
-    'Locations'     => '#VALUE!',
+    'Locations'     => '',
     'Matchcode'     => 'رمز مطابق',
     'Month'         => 'شهر',
     'Name'          => 'اسم',
@@ -39,7 +39,7 @@ return ['WarehouseManagement' => [
     'Shipping'      => 'شحن',
     'Statistics'    => 'إحصائيات',
     'Stock'         => 'المخزون',
-    'Stocks'        => '#VALUE!',
+    'Stocks'        => '',
     'Street'        => 'شارع',
     'Today'         => 'اليوم',
     'Type'          => 'نوع',
diff --git a/Theme/Backend/Lang/cs.lang.php b/Theme/Backend/Lang/cs.lang.php
index b4ca466..3cd9e3c 100755
--- a/Theme/Backend/Lang/cs.lang.php
+++ b/Theme/Backend/Lang/cs.lang.php
@@ -29,7 +29,7 @@ return ['WarehouseManagement' => [
     'Localization'  => '',
     'Localizations' => '',
     'Location'      => 'Umístění',
-    'Locations'     => '#VALUE!',
+    'Locations'     => '',
     'Matchcode'     => 'MatchCode.',
     'Month'         => 'Měsíc',
     'Name'          => 'název',
@@ -39,7 +39,7 @@ return ['WarehouseManagement' => [
     'Shipping'      => 'Lodní doprava',
     'Statistics'    => 'Statistika',
     'Stock'         => 'Skladem',
-    'Stocks'        => '#VALUE!',
+    'Stocks'        => '',
     'Street'        => 'ulice',
     'Today'         => 'Dnes',
     'Type'          => 'Typ',
diff --git a/Theme/Backend/Lang/da.lang.php b/Theme/Backend/Lang/da.lang.php
index 31b15e9..46f64e1 100755
--- a/Theme/Backend/Lang/da.lang.php
+++ b/Theme/Backend/Lang/da.lang.php
@@ -29,7 +29,7 @@ return ['WarehouseManagement' => [
     'Localization'  => '',
     'Localizations' => '',
     'Location'      => 'Beliggenhed',
-    'Locations'     => '#VALUE!',
+    'Locations'     => '',
     'Matchcode'     => 'MatchCode.',
     'Month'         => 'Måned',
     'Name'          => 'Navn',
@@ -39,7 +39,7 @@ return ['WarehouseManagement' => [
     'Shipping'      => 'Forsendelse',
     'Statistics'    => 'Statistikker',
     'Stock'         => 'Lager',
-    'Stocks'        => '#VALUE!',
+    'Stocks'        => '',
     'Street'        => 'Gade',
     'Today'         => 'I dag',
     'Type'          => 'Type',
diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php
index b6f43db..72b1243 100755
--- a/Theme/Backend/Lang/de.lang.php
+++ b/Theme/Backend/Lang/de.lang.php
@@ -29,7 +29,7 @@ return ['WarehouseManagement' => [
     'Localization'  => '',
     'Localizations' => '',
     'Location'      => 'Ort',
-    'Locations'     => '#VALUE!',
+    'Locations'     => '',
     'Matchcode'     => 'Matchcode',
     'Month'         => 'Monat',
     'Name'          => 'Name',
@@ -39,7 +39,7 @@ return ['WarehouseManagement' => [
     'Shipping'      => 'Versand',
     'Statistics'    => 'Statistiken',
     'Stock'         => 'Aktie',
-    'Stocks'        => '#VALUE!',
+    'Stocks'        => '',
     'Street'        => 'Straße',
     'Today'         => 'Heute',
     'Type'          => 'Typ',
diff --git a/Theme/Backend/Lang/el.lang.php b/Theme/Backend/Lang/el.lang.php
index 1bcc5c0..d2e4a59 100755
--- a/Theme/Backend/Lang/el.lang.php
+++ b/Theme/Backend/Lang/el.lang.php
@@ -29,7 +29,7 @@ return ['WarehouseManagement' => [
     'Localization'  => '',
     'Localizations' => '',
     'Location'      => 'Τοποθεσία',
-    'Locations'     => '#VALUE!',
+    'Locations'     => '',
     'Matchcode'     => 'Matchcode',
     'Month'         => 'Μήνας',
     'Name'          => 'Ονομα',
@@ -39,7 +39,7 @@ return ['WarehouseManagement' => [
     'Shipping'      => 'Αποστολή',
     'Statistics'    => 'Στατιστική',
     'Stock'         => 'Στοκ',
-    'Stocks'        => '#VALUE!',
+    'Stocks'        => '',
     'Street'        => 'Δρόμος',
     'Today'         => 'Σήμερα',
     'Type'          => 'Τύπος',
diff --git a/Theme/Backend/Lang/es.lang.php b/Theme/Backend/Lang/es.lang.php
index 57dd99f..4f2bd86 100755
--- a/Theme/Backend/Lang/es.lang.php
+++ b/Theme/Backend/Lang/es.lang.php
@@ -29,7 +29,7 @@ return ['WarehouseManagement' => [
     'Localization'  => '',
     'Localizations' => '',
     'Location'      => 'Ubicación',
-    'Locations'     => '#VALUE!',
+    'Locations'     => '',
     'Matchcode'     => 'Código de asociación',
     'Month'         => 'Mes',
     'Name'          => 'Nombre',
@@ -39,7 +39,7 @@ return ['WarehouseManagement' => [
     'Shipping'      => 'Transporte',
     'Statistics'    => 'Estadísticas',
     'Stock'         => 'Valores',
-    'Stocks'        => '#VALUE!',
+    'Stocks'        => '',
     'Street'        => 'calle',
     'Today'         => 'Hoy dia',
     'Type'          => 'Escribe',
diff --git a/Theme/Backend/Lang/fi.lang.php b/Theme/Backend/Lang/fi.lang.php
index 50b44cc..9de2a2a 100755
--- a/Theme/Backend/Lang/fi.lang.php
+++ b/Theme/Backend/Lang/fi.lang.php
@@ -29,7 +29,7 @@ return ['WarehouseManagement' => [
     'Localization'  => '',
     'Localizations' => '',
     'Location'      => 'Sijainti',
-    'Locations'     => '#VALUE!',
+    'Locations'     => '',
     'Matchcode'     => 'Matchcode',
     'Month'         => 'Kuukausi',
     'Name'          => 'Nimi',
@@ -39,7 +39,7 @@ return ['WarehouseManagement' => [
     'Shipping'      => 'laivaus',
     'Statistics'    => 'Tilastot',
     'Stock'         => 'Varasto',
-    'Stocks'        => '#VALUE!',
+    'Stocks'        => '',
     'Street'        => 'Katu',
     'Today'         => 'Tänään',
     'Type'          => 'Tyyppi',
diff --git a/Theme/Backend/Lang/fr.lang.php b/Theme/Backend/Lang/fr.lang.php
index b58d0d0..412fd45 100755
--- a/Theme/Backend/Lang/fr.lang.php
+++ b/Theme/Backend/Lang/fr.lang.php
@@ -29,7 +29,7 @@ return ['WarehouseManagement' => [
     'Localization'  => '',
     'Localizations' => '',
     'Location'      => 'Emplacement',
-    'Locations'     => '#VALUE!',
+    'Locations'     => '',
     'Matchcode'     => 'Encadrement',
     'Month'         => 'Mois',
     'Name'          => 'Nom',
@@ -39,7 +39,7 @@ return ['WarehouseManagement' => [
     'Shipping'      => 'Expédition',
     'Statistics'    => 'Statistiques',
     'Stock'         => 'Stocker',
-    'Stocks'        => '#VALUE!',
+    'Stocks'        => '',
     'Street'        => 'rue',
     'Today'         => 'Aujourd\'hui',
     'Type'          => 'Taper',
diff --git a/Theme/Backend/Lang/hu.lang.php b/Theme/Backend/Lang/hu.lang.php
index aa8c6f1..c4af5ca 100755
--- a/Theme/Backend/Lang/hu.lang.php
+++ b/Theme/Backend/Lang/hu.lang.php
@@ -29,7 +29,7 @@ return ['WarehouseManagement' => [
     'Localization'  => '',
     'Localizations' => '',
     'Location'      => 'Elhelyezkedés',
-    'Locations'     => '#VALUE!',
+    'Locations'     => '',
     'Matchcode'     => 'Matchcode',
     'Month'         => 'Hónap',
     'Name'          => 'Név',
@@ -39,7 +39,7 @@ return ['WarehouseManagement' => [
     'Shipping'      => 'Szállítás',
     'Statistics'    => 'Statisztika',
     'Stock'         => 'Készlet',
-    'Stocks'        => '#VALUE!',
+    'Stocks'        => '',
     'Street'        => 'utca',
     'Today'         => 'Ma',
     'Type'          => 'típus',
diff --git a/Theme/Backend/Lang/it.lang.php b/Theme/Backend/Lang/it.lang.php
index 7fc7185..f003ddb 100755
--- a/Theme/Backend/Lang/it.lang.php
+++ b/Theme/Backend/Lang/it.lang.php
@@ -29,7 +29,7 @@ return ['WarehouseManagement' => [
     'Localization'  => '',
     'Localizations' => '',
     'Location'      => 'Posizione',
-    'Locations'     => '#VALUE!',
+    'Locations'     => '',
     'Matchcode'     => 'Matchcode.',
     'Month'         => 'Mese',
     'Name'          => 'Nome',
@@ -39,7 +39,7 @@ return ['WarehouseManagement' => [
     'Shipping'      => 'Spedizione',
     'Statistics'    => 'Statistiche',
     'Stock'         => 'Azione',
-    'Stocks'        => '#VALUE!',
+    'Stocks'        => '',
     'Street'        => 'strada',
     'Today'         => 'Oggi',
     'Type'          => 'Tipo',
diff --git a/Theme/Backend/Lang/ja.lang.php b/Theme/Backend/Lang/ja.lang.php
index c3964ff..25d16f2 100755
--- a/Theme/Backend/Lang/ja.lang.php
+++ b/Theme/Backend/Lang/ja.lang.php
@@ -29,7 +29,7 @@ return ['WarehouseManagement' => [
     'Localization'  => '',
     'Localizations' => '',
     'Location'      => '位置',
-    'Locations'     => '#VALUE!',
+    'Locations'     => '',
     'Matchcode'     => 'マッチコード',
     'Month'         => '月',
     'Name'          => '名前',
@@ -39,7 +39,7 @@ return ['WarehouseManagement' => [
     'Shipping'      => '運送',
     'Statistics'    => '統計学',
     'Stock'         => 'ストック',
-    'Stocks'        => '#VALUE!',
+    'Stocks'        => '',
     'Street'        => '街',
     'Today'         => '今日',
     'Type'          => 'タイプ',
diff --git a/Theme/Backend/Lang/ko.lang.php b/Theme/Backend/Lang/ko.lang.php
index b5801a2..6b13740 100755
--- a/Theme/Backend/Lang/ko.lang.php
+++ b/Theme/Backend/Lang/ko.lang.php
@@ -29,7 +29,7 @@ return ['WarehouseManagement' => [
     'Localization'  => '',
     'Localizations' => '',
     'Location'      => '위치',
-    'Locations'     => '#VALUE!',
+    'Locations'     => '',
     'Matchcode'     => '매치 코드',
     'Month'         => '월',
     'Name'          => '이름',
@@ -39,7 +39,7 @@ return ['WarehouseManagement' => [
     'Shipping'      => '배송',
     'Statistics'    => '통계',
     'Stock'         => '재고',
-    'Stocks'        => '#VALUE!',
+    'Stocks'        => '',
     'Street'        => '거리',
     'Today'         => '오늘',
     'Type'          => '유형',
diff --git a/Theme/Backend/Lang/no.lang.php b/Theme/Backend/Lang/no.lang.php
index bb016bd..d45ba78 100755
--- a/Theme/Backend/Lang/no.lang.php
+++ b/Theme/Backend/Lang/no.lang.php
@@ -29,7 +29,7 @@ return ['WarehouseManagement' => [
     'Localization'  => '',
     'Localizations' => '',
     'Location'      => 'plassering',
-    'Locations'     => '#VALUE!',
+    'Locations'     => '',
     'Matchcode'     => 'MatchCode.',
     'Month'         => 'Måned',
     'Name'          => 'Navn',
@@ -39,7 +39,7 @@ return ['WarehouseManagement' => [
     'Shipping'      => 'Shipping',
     'Statistics'    => 'Statistikk',
     'Stock'         => 'Lager',
-    'Stocks'        => '#VALUE!',
+    'Stocks'        => '',
     'Street'        => 'gate',
     'Today'         => 'I dag',
     'Type'          => 'Type',
diff --git a/Theme/Backend/Lang/pl.lang.php b/Theme/Backend/Lang/pl.lang.php
index 68e8e83..98770ba 100755
--- a/Theme/Backend/Lang/pl.lang.php
+++ b/Theme/Backend/Lang/pl.lang.php
@@ -29,7 +29,7 @@ return ['WarehouseManagement' => [
     'Localization'  => '',
     'Localizations' => '',
     'Location'      => 'Lokalizacja',
-    'Locations'     => '#VALUE!',
+    'Locations'     => '',
     'Matchcode'     => 'MatchCode.',
     'Month'         => 'Miesiąc',
     'Name'          => 'Nazwa',
@@ -39,7 +39,7 @@ return ['WarehouseManagement' => [
     'Shipping'      => 'Wysyłka',
     'Statistics'    => 'Statystyka',
     'Stock'         => 'Magazyn',
-    'Stocks'        => '#VALUE!',
+    'Stocks'        => '',
     'Street'        => 'Ulica',
     'Today'         => 'Dziś',
     'Type'          => 'Rodzaj',
diff --git a/Theme/Backend/Lang/pt.lang.php b/Theme/Backend/Lang/pt.lang.php
index d24bf85..6555c0e 100755
--- a/Theme/Backend/Lang/pt.lang.php
+++ b/Theme/Backend/Lang/pt.lang.php
@@ -29,7 +29,7 @@ return ['WarehouseManagement' => [
     'Localization'  => '',
     'Localizations' => '',
     'Location'      => 'Localização',
-    'Locations'     => '#VALUE!',
+    'Locations'     => '',
     'Matchcode'     => 'Código de combinação',
     'Month'         => 'Mês',
     'Name'          => 'Nome',
@@ -39,7 +39,7 @@ return ['WarehouseManagement' => [
     'Shipping'      => 'Envio',
     'Statistics'    => 'Estatisticas',
     'Stock'         => 'Estoque',
-    'Stocks'        => '#VALUE!',
+    'Stocks'        => '',
     'Street'        => 'rua',
     'Today'         => 'Hoje',
     'Type'          => 'Modelo',
diff --git a/Theme/Backend/Lang/ru.lang.php b/Theme/Backend/Lang/ru.lang.php
index 0810796..95806a7 100755
--- a/Theme/Backend/Lang/ru.lang.php
+++ b/Theme/Backend/Lang/ru.lang.php
@@ -29,7 +29,7 @@ return ['WarehouseManagement' => [
     'Localization'  => '',
     'Localizations' => '',
     'Location'      => 'Место расположения',
-    'Locations'     => '#VALUE!',
+    'Locations'     => '',
     'Matchcode'     => 'MatchCode.',
     'Month'         => 'Месяц',
     'Name'          => 'Имя',
@@ -39,7 +39,7 @@ return ['WarehouseManagement' => [
     'Shipping'      => 'Перевозки',
     'Statistics'    => 'Статистика',
     'Stock'         => 'Склад',
-    'Stocks'        => '#VALUE!',
+    'Stocks'        => '',
     'Street'        => 'улица',
     'Today'         => 'Сегодня',
     'Type'          => 'Тип',
diff --git a/Theme/Backend/Lang/sv.lang.php b/Theme/Backend/Lang/sv.lang.php
index 2624aa0..c44bce8 100755
--- a/Theme/Backend/Lang/sv.lang.php
+++ b/Theme/Backend/Lang/sv.lang.php
@@ -29,7 +29,7 @@ return ['WarehouseManagement' => [
     'Localization'  => '',
     'Localizations' => '',
     'Location'      => 'Plats',
-    'Locations'     => '#VALUE!',
+    'Locations'     => '',
     'Matchcode'     => 'Matchcode',
     'Month'         => 'Månad',
     'Name'          => 'namn',
@@ -39,7 +39,7 @@ return ['WarehouseManagement' => [
     'Shipping'      => 'Frakt',
     'Statistics'    => 'Statistik',
     'Stock'         => 'Stock',
-    'Stocks'        => '#VALUE!',
+    'Stocks'        => '',
     'Street'        => 'Gata',
     'Today'         => 'I dag',
     'Type'          => 'Typ',
diff --git a/Theme/Backend/Lang/th.lang.php b/Theme/Backend/Lang/th.lang.php
index 902c700..1bd8201 100755
--- a/Theme/Backend/Lang/th.lang.php
+++ b/Theme/Backend/Lang/th.lang.php
@@ -29,7 +29,7 @@ return ['WarehouseManagement' => [
     'Localization'  => '',
     'Localizations' => '',
     'Location'      => 'ที่ตั้ง',
-    'Locations'     => '#VALUE!',
+    'Locations'     => '',
     'Matchcode'     => 'การจับคู่',
     'Month'         => 'เดือน',
     'Name'          => 'ชื่อ',
@@ -39,7 +39,7 @@ return ['WarehouseManagement' => [
     'Shipping'      => 'การส่งสินค้า',
     'Statistics'    => 'สถิติ',
     'Stock'         => 'คลังสินค้า',
-    'Stocks'        => '#VALUE!',
+    'Stocks'        => '',
     'Street'        => 'ถนน',
     'Today'         => 'วันนี้',
     'Type'          => 'พิมพ์',
diff --git a/Theme/Backend/Lang/tr.lang.php b/Theme/Backend/Lang/tr.lang.php
index 7231bf9..b63a8b5 100755
--- a/Theme/Backend/Lang/tr.lang.php
+++ b/Theme/Backend/Lang/tr.lang.php
@@ -29,7 +29,7 @@ return ['WarehouseManagement' => [
     'Localization'  => '',
     'Localizations' => '',
     'Location'      => 'Konum',
-    'Locations'     => '#VALUE!',
+    'Locations'     => '',
     'Matchcode'     => 'Maç Kodu',
     'Month'         => 'Ay',
     'Name'          => 'İsim',
@@ -39,7 +39,7 @@ return ['WarehouseManagement' => [
     'Shipping'      => 'Nakliye',
     'Statistics'    => 'İstatistik',
     'Stock'         => 'Stoklamak',
-    'Stocks'        => '#VALUE!',
+    'Stocks'        => '',
     'Street'        => 'sokak',
     'Today'         => 'Bugün',
     'Type'          => 'Tip',
diff --git a/Theme/Backend/Lang/uk.lang.php b/Theme/Backend/Lang/uk.lang.php
index 8a76816..e3f1554 100755
--- a/Theme/Backend/Lang/uk.lang.php
+++ b/Theme/Backend/Lang/uk.lang.php
@@ -29,7 +29,7 @@ return ['WarehouseManagement' => [
     'Localization'  => '',
     'Localizations' => '',
     'Location'      => 'Місцезнаходження',
-    'Locations'     => '#VALUE!',
+    'Locations'     => '',
     'Matchcode'     => 'Матч',
     'Month'         => 'Місяць',
     'Name'          => 'Назва',
@@ -39,7 +39,7 @@ return ['WarehouseManagement' => [
     'Shipping'      => 'Доставка',
     'Statistics'    => 'Статистика',
     'Stock'         => 'Запас',
-    'Stocks'        => '#VALUE!',
+    'Stocks'        => '',
     'Street'        => 'Вулиця',
     'Today'         => 'Сьогодні',
     'Type'          => 'Тип',
diff --git a/Theme/Backend/Lang/zh.lang.php b/Theme/Backend/Lang/zh.lang.php
index f26e0ff..b17320a 100755
--- a/Theme/Backend/Lang/zh.lang.php
+++ b/Theme/Backend/Lang/zh.lang.php
@@ -29,7 +29,7 @@ return ['WarehouseManagement' => [
     'Localization'  => '',
     'Localizations' => '',
     'Location'      => '地点',
-    'Locations'     => '#VALUE!',
+    'Locations'     => '',
     'Matchcode'     => '匹配码',
     'Month'         => '月',
     'Name'          => '名称',
@@ -39,7 +39,7 @@ return ['WarehouseManagement' => [
     'Shipping'      => '船运',
     'Statistics'    => '统计数据',
     'Stock'         => '库存',
-    'Stocks'        => '#VALUE!',
+    'Stocks'        => '',
     'Street'        => '街道',
     'Today'         => '今天',
     'Type'          => '类型',