diff --git a/taxonomies/additives.txt b/taxonomies/additives.txt
index 39f4a5e007852..8631ce8940d58 100644
--- a/taxonomies/additives.txt
+++ b/taxonomies/additives.txt
@@ -555,7 +555,7 @@ hy:E120, Կարմին
 ia:E120, carmin
 io:E120, Karmino
 it:E120, Cocciniglia, acido carminico, vari tipi di carminio, C22H20O13
-ja:E120, コチニール色素, コチニール
+ja:E120, コチニール色素, コチニール, カルミン酸色素
 ky:E120, Кармин
 lt:E120, Košenilis, karmino rūgštis, karminai
 lv:E120, Košenils, karmīnskābe, karmīni
@@ -1478,7 +1478,7 @@ id:E150, Karamel
 io:E150, Karamelo
 is:E150, Karamella
 it:E150, caramello
-ja:E150, キャラメル
+ja:E150, キャラメル, カラメル
 ka:E150, კარამელი
 kk:E150, Карамель
 kn:E150, ಕ್ಯಾರಮೆಲ್
@@ -2141,20 +2141,26 @@ vegetarian:en:yes
 
 
 en:E160b, Annatto, bixin, norbixin, roucou, achiote, annatto color, annatto colour
+ar:E160b, أناتو
 bg:E160b, Анато, биксин, норбиксин (i), БИКСИН И НОРБИКСИН
-ca:E160b, Bixina, norbixina de bixa, norbixina
+ca:E160b, Arxiota, Bixina, norbixina de bixa, norbixina
 cs:E160b, Annatto, bixin, norbixin
 da:E160b, Annatto, Annattoekstrakter (bixin og norbixin), Annattoekstrakter, Bixin, Norbixin
 de:E160b, Annatto (Bixin und Norbixin), Bixin und Norbixin, Annatto, Achote, Orlean, E 160b, Anatto, Bixin, Norbixin, Annatto Bixin
 el:E160b, Αννατο, μπιξινη, νορμπιξινη (i)
+eo:E160b, Biksa kolorigilo
 es:E160b, Annato, bixina, norbixina, Achiote,anato
 et:E160b, Annaato, biksiin, norbiksiin (i)
 fi:E160b, Annatto, biksiini, norbiksiini, Annattoa, biksiiniä, norbiksiiniä
 fr:E160b, Rocou, annatto, mélange de bixine et norbixine, Bixine, Norbixine, Annatto extract, Extraits de rocou, Extrait de graine de roucou, base de bixine, base de norbixine, CI 75120, Orange naturel CI n.4, Natural orange 4, CAS 1393-63-1, 89957-43-7, CAS 6983-79-5, Annatto seed extract, Bixa orellana seed extract, bixa orellana, achiote, Annatto G
 hr:E160b, annatto, e160b(i), e160b(ii), annato norbixin
 hu:E160b, Annatto, bixin, norbixin
+is:E160b, Annatto
 it:E160b, Annatto, bissina, norbissina, C24H28O4
 ja:E160b, アナトー色素, アナトー
+jv:E160b, Annatto
+kn:E160b, ಅನಾಟೋ
+ko:E160b, 안나토
 lt:E160b, Anatas, biksinas, norbiksinas
 lv:E160b, Annato, biksīns, norbiksīns
 mt:E160b, Annatto, biksin, norbiksin
@@ -2166,7 +2172,11 @@ ro:E160b, Annatto, bixină, norbixină (i)
 ru:E160b, Annatto, аннато, экстракт анато
 sk:E160b, Annatto, bixín, norbixín
 sl:E160b, Anato, biksin, norbiksin
+sr:E160b, Anato
 sv:E160b, Annattoextrakt, bixin, norbixin i., Annatto, E 160b, Roucou
+vi:E160b, Màu điều nhuộm
+zh:E160b, 胭脂樹紅
+wikidata:en:Q425902
 colour_index:en:CI 75120
 e_number:en:160b
 efsa_evaluation_url:en: http://dx.doi.org/10.2903/j.efsa.2016.4544
@@ -10211,7 +10221,7 @@ fr:E401, alginate de sodium
 hr:E401
 hu:E401, Nátrium-alginát
 it:E401, alginato di sodio, sodio alginato
-ja:E401, アルギン酸ナトリウム
+ja:E401, アルギン酸ナトリウム, アルギニン酸na
 lt:E401, Natrio alginatas
 lv:E401, Nātrija algināts
 mt:E401, Alġinat tas-sodju
@@ -11258,6 +11268,7 @@ fi:E424, Curdlan
 fr:E424, Curdlan
 hu:E424, E424 food additive
 it:E424, E424 food additive
+ja:E424, カードラン
 lt:E424, E424 food additive
 lv:E424, E424 food additive
 mt:E424, E424 food additive
@@ -12584,6 +12595,7 @@ fr:E450(i), Pyrophosphate de sodium acide, Pyrophosphate acide de sodium, Diphos
 hr:E450(i), E450i, dinatrijev difosfat
 hu:E450(i), Dinátrium-difoszfát
 it:E450(i), Difosfato disodico
+ja:E450(i), ピロリン酸ナトリウム
 lt:E450(i), Dinatrio difosfatas
 lv:E450(i), Dinātrija difosfāts
 mt:E450(i), Difosfat disodiku, Difosfat didroġenat disodiku, Pirofosfat didroġenat disodiku, Pirofosfat tal-aċidu tas-sodju
@@ -17759,7 +17771,7 @@ fi:E578, Kalsiumglukonaatti, Kalsiumglukonaattia
 fr:E578, Gluconate de calcium, Pentahydroxyéthanoate de calcium, Gluconate calcique
 hu:E578, kalcium-glükonát
 it:E578, gluconato di calcio
-ja:E578, グルコン酸カルシウム
+ja:E578, グルコン酸カルシウム, グルコン酸ｃａ
 lt:E578, kalcio gliukonatas
 lv:E578, kalcija glikonāts
 mt:E578, glukonat tal-kalċju
@@ -18600,6 +18612,7 @@ fi:E639, Alaniini, Alaniinia
 fr:E639, Alanine
 hu:E639, Alanin
 it:E639, E639 food additive
+ja:E639, アラニン
 lt:E639, E639 food additive
 lv:E639, E639 food additive
 mt:E639, E639 food additive
@@ -21227,7 +21240,7 @@ hu:E951, Aszpartám
 id:E951, Aspartam
 is:E951, Aspartam
 it:E951, Aspartame
-ja:E951, アスパルテーム, アスパルテーム L-フェニルアラニン化合物
+ja:E951, アスパルテーム, アスパルテーム L-フェニルアラニン化合物, l-フェニルアラニン化合物
 ko:E951, 아스파탐
 lt:E951, Aspartamas
 lv:E951, Aspartāms
@@ -21625,6 +21638,7 @@ fr:E960, Glucosides de stéviol, stévioside, rébaudioside A, extrait de stévi
 hr:E960, steviol glikozidi, stevia list, steviol glikozidi iz stevije
 hu:E960, Szteviol-glikozidok szinonimák
 it:E960, Glicosidi dello steviolo, glicosidi steviolici, Estratto di stevia
+ja:E960, ステビア
 lt:E960, Steviolio glikozidai
 lv:E960, Steviolglikozīdi
 mt:E960, Glikosidi tal-istevjol
diff --git a/taxonomies/additives_classes.txt b/taxonomies/additives_classes.txt
index f6848d5a2b70f..e47cb286d5d12 100644
--- a/taxonomies/additives_classes.txt
+++ b/taxonomies/additives_classes.txt
@@ -76,7 +76,7 @@ hu: Savanyúságot szabályozó anyag, Savanyúságot szabályozó anyagok, Sava
 id: pengatur keasaman
 is: Sýrustillir, Sýrustillar
 it: correttore di acidità, correttori di acidità, regolatore di acidità, regolatori di acidità, correttore d'acidità
-ja: pH調整剤
+ja: pH調整剤, ｐｈ調整剤
 lt: Rūgštingumą reguliuojanti medžiaga
 lv: Skābuma regulētājs
 mt: Regolatur tal-Aċidità
@@ -1065,6 +1065,7 @@ hr: sredstvo za rahljenje, tvar za rahljenje, tvari za rahljenje, tvar za rahlje
 hu: Térfogatnövelő szer, térfogatnövelő szerek
 is: Lyftiefni
 it: Agente lievitante, agenti lievitanti, lievitante, lievitanti
+ja:膨脹剤
 lv: Irdinātājs
 lt: Tešlos kildymo medžiaga
 mt: Aġent li jgħolli l-ikel
@@ -1168,7 +1169,7 @@ hu: Stabilizátor, stabilizátorok, kötőanyag
 ga: Cobhsaitheoir
 is:bindiefni
 it: Stabilizzante, stabilizzanti, agente stabilizzante, agenti stabilizzanti, legante, leganti
-ja: 増粘安定剤, 糊料
+ja: 増粘安定剤, 糊料, 安定剤, 結着剤
 lt: Stabilizatorius
 lv: Stabilizētājs
 mk: стабилизатор, стабилизатори
@@ -1210,9 +1211,6 @@ description:sv:Stabiliseringsmedel: ämnen som gör det möjligt att bevara ett
 <en:stabiliser
 en:natural stabilizer
 
-# ja: 安定剤, 結着剤 -- Binds together material/retain hydration. ex) starches, casein, phosphoric acids, trisodium phosphate. en: binding agent?
-
-
 # nova:en:sweetener
 en: Sweetener, bulk sweetener, intense sweetener, natural sweetener
 bg: Подсладител, подсладители
diff --git a/taxonomies/ingredients.txt b/taxonomies/ingredients.txt
index 60407e8688250..2ec1850693532 100644
--- a/taxonomies/ingredients.txt
+++ b/taxonomies/ingredients.txt
@@ -49,6 +49,7 @@ stopwords:hu:tartalmaz, változó arányban, min, zsírtartalom, összetevő, ö
 stopwords:id:mengandung
 stopwords:is:úr
 stopwords:it:contiene, nella
+stopwords:ja:等, その他
 stopwords:lt:iš, su, su pridėtiniu, mažiausiai, įskaitant
 stopwords:lv:no
 stopwords:nb:av, fra, bl a, blant annet, tilsatt
@@ -108,7 +109,7 @@ fr:sirop de caramel, sirop caramel
 hr:karamel sirup, karamelizirani sirup, karamelov sirup
 hu:karamellszirup, karamell szirup, karamell-szirup, karamella szirup
 it:sciroppo di caramello
-ja:キャラメルシロップ
+ja:キャラメルシロップ, カラメルシラップ
 lt:karamelizuotas sirupas, karamelizuoto sirupo
 nl:Karamel siroop
 pl:syrop karmelowy
@@ -875,6 +876,7 @@ fr:amidon modifié de pomme de terre, amidon modifié de pommes de terre, amidon
 hr:modificirani krumpirov škrob
 hu:módosított burgonyakeményítő
 it:amido di patate modificiate, amido modificato di patata
+ja:加工澱粉, じゃがいもでん粉
 lt:modifikuotas bulvių krakmolas
 nb:modifisert potetstivelse
 nl:gemodificeerd aardappelzetmeel
@@ -11958,7 +11960,7 @@ fr:porc
 he:חזיר
 hu:sertés, disznó, malac
 it:suino
-ja:豚
+ja:豚, ポーク
 nb:svin, flesk
 nl:varken
 pl:Wieprzowina
@@ -13676,7 +13678,7 @@ hu:kukoricakeményítő
 id:tepung jagung
 is:maíssterkja
 it:amido di mais
-ja:コーンスターチ
+ja:コーンスターチ, とうもろこしでん粉
 kk:жүгері крахмалы
 ko:옥수수 녹말
 lt:kukurūzų krakmolas
@@ -13965,6 +13967,55 @@ sv:kornstärkelse
 allergens:en: en:gluten
 # ingredient/fr:amidon-d'orge has 1 product in 1 language @2020-06-08
 
+<en:starch
+en:Sago
+ar:ساغو
+be:Сага
+bn:সাগু
+ca:Sagú
+cs:Ságo
+da:Sago
+de:Sago
+dv:ސާގު
+eo:Saguo
+es:Sagú
+et:Saago
+eu:Sago
+fa:ساگو
+fi:Saago
+fr:Sagou
+gu:સાબુદાણા
+hi:साबूदाना
+id:Sagu
+io:Saguto
+is:Sagó
+it:Sago
+ja:サゴヤシ, サゴ
+jv:Sagu
+kk:Саго
+kn:ಸಬ್ಬಕ್ಕಿ
+ko:사고
+la:Sagum
+lt:Sagas
+ml:പനനൂറ്
+mr:साबुदाणा
+ms:Sagu
+nl:Sago
+no:Sago
+pl:Sago
+pt:Sagu
+ru:Саго
+su:Sagu
+sv:Sago
+ta:சவ்வரிசி
+te:సగ్గుబియ్యం
+tl:Sago
+uk:Саго
+vi:Sago
+zh:西米
+wikidata:en:Q218778
+description:en:starch extracted from tropical palm stems
+
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 #
 #                                 O I L S   A N D   F A T S   S E C T I O N
@@ -15340,7 +15391,7 @@ hu:kókuszolaj
 id:Minyak kelapa
 is:kókosolía
 it:olio di cocco
-ja:ヤシ油
+ja:ヤシ油, ココナッツオイル
 kn:ಕೊಬ್ಬರಿ ಎಣ್ಣೆ
 ko:야자유
 lt:kokosų aliejus
@@ -25507,6 +25558,7 @@ he:קמח שיפון
 hr:raženo brašno
 hu:rozsliszt
 it:farina di segala, farina di segale
+ja:ライ麦粉
 nb:rugmel
 nl:roggemeel, roggebloem, rogge-bloem
 pl:mąka żytnia
@@ -25738,6 +25790,7 @@ hr:kukuruzno brašno
 hu:kukoricaliszt
 is:maísmjöl
 it:farina di mais
+ja:コーンフラワー
 lt:kukurūzų miltai
 lv:kukurūzas milti
 nb:maismel
@@ -26010,7 +26063,7 @@ id:jagung
 io:maizo
 is:maís
 it:mais
-ja:トウモロコシ, とうもろこし
+ja:トウモロコシ, とうもろこし, コーン
 jv:jagung
 ka:სიმინდი
 kg:disângu
@@ -26324,7 +26377,7 @@ fr:pétales de maïs, pétale de maïs, cornflakes, corn flakes, flocons de maï
 hr:kukuruzne pahuljice
 hu:kukoricapehely
 it:fiocchi di mais, cornflakes
-ja:コーンフレーク
+# ja:コーンフレーク # see ingredients_processings.txt
 nl:maïsvlokken, cornflakes
 pl:płatki kukurydziane
 pt:flocos de milho
@@ -26462,7 +26515,7 @@ ii:ꍯ
 io:Rizo
 is:Hrísgrjón
 it:riso
-ja:米
+ja:米, ご飯
 jv:Pantun
 ka:ბრინჯი
 kk:Күріш
@@ -27041,7 +27094,6 @@ fr:riz pour risotto étuvé
 
 ########################### RICE SPECIES #######################
 
-#comment:en:Note that red rice is not really a rice. It is kept here for easy retrieval
 #category/wild-rices
 <en:cereal
 en:wild rice
@@ -27073,6 +27125,7 @@ fr:riz sauvage noir
 hu:fekete vadrizs
 nl:zwarte wilde rijst
 
+#comment:en:Note that red rice is not really a rice. It is kept here for easy retrieval
 <en:rice
 en:red rice
 ar:أرز أحمر
@@ -27599,6 +27652,23 @@ en:germinated red rice, sprouted red rice
 de:gekeimter roter Reis
 fr:riz rouge germé
 
+<en:red rice
+<en:yeast
+en:Red yeast rice
+de:Rot fermentierter Reis
+es:Arroz de levadura roja
+fi:Punainen riisi
+fr:Levure de riz rouge
+id:Angkak
+ja:紅麹
+jv:Angkak
+ko:홍국
+pt:Arroz fermentado vermelho
+ru:Красный дрожжевой рис
+tr:Kırmızı pirinç mayası
+zh:紅麴米
+wikidata:en:Q1135788
+
 <en:black rice
 <en:germinated rice
 en:germinated black rice, sprouted black rice
@@ -28528,7 +28598,7 @@ hy:Մալթոզ
 id:maltosa
 is:Maltósi
 it:maltosio
-ja:マルトース
+ja:マルトース, 麦芽糖
 ka:მალტოზა
 kk:Мальтоза
 ko:말토스
@@ -29100,6 +29170,21 @@ fr:sirop de glucose de blé
 nl:tarweglucosestroop
 sv:glukossirap från vetemjöl
 
+<en:glucose syrup
+en:Mizuame
+de:Mizuame
+es:Mizuame
+fa:میزوآمه
+fr:Mizuame
+ja:麦水飴
+pa:ਮਿਜ਼ੂਆਮੇ
+pl:Mizuame
+sq:Mizuame
+zh:水飴
+wikidata:en:Q3044475
+description:en:A clear, thick, sticky liquid, it is made by converting starch to sugars.
+# in Japanese 水飴 (mizuame) is generic for glucose syrup
+
 <en:cereal glucose syrup
 <en:powdered glucose syrup
 #en:processing:en:powder
@@ -30238,6 +30323,7 @@ fr:protéine de soja, protéines de soja
 hu:szójafehérje
 hr:bjelančevine soje, hidrolizat sojinih bjelančevina, sojine bjelančevine, bjelančevina soje
 it:proteine di soia
+ja:大豆たんぱく, 大豆タンパク, 大豆たん白
 nl:soja-eiwit, sojaeiwitten
 pl:Białko sojowe, hydrolizat białka sojowego, białko soi, białko z soi, białka sojowego
 pt:Proteína de soja
@@ -30702,7 +30788,7 @@ fi:natriumkaseinaatti
 fr:caséinate de sodium
 hu:nátrium-kazeinát
 it:caseinato di sodio, cassinato di sodio
-ja:カゼインナトリウム, カゼインNa
+ja:カゼインナトリウム, カゼインNa, カゼインＮａ
 nl:natriumcaseïnaat
 pl:kazeinian sodu
 pt:caseinato de sódio
@@ -30770,7 +30856,7 @@ hr:kakao, kakaov, theobroma cacao L, kakaovca
 hu:kakaó
 id:Kakao
 it:cacao
-ja:ココア
+ja:ココア, カカオ
 ko:코코아
 lt:kakava
 mt:kawkaw
@@ -31200,6 +31286,7 @@ es:pepitas de cacao, trozos de habas de cacao, trocitos de pepitas de cacao
 fi:Kaakaopapusipsit
 fr:éclats de fèves de cacao
 it:granella di semi di cacao, scaglie di cacao, granella di fave di cacao, granella di cacao
+ja:カカオニブ
 # ingredient/fr:éclats-de-fèves-de-cacao has 122 products in 6 languages @2019-05-26
 
 <en:cocoa bean chips
@@ -32143,7 +32230,7 @@ hu:Ásványvíz
 hy:Հանքային ջուր
 id:Air mineral
 it:Acqua minerale
-ja:ミネラルウォーター, 鉱泉水
+ja:ミネラルウォーター, 鉱泉水, 鉱水
 ka:მინერალური წყალი
 kk:Минерал су
 ky:Минералдуу суулар
@@ -32758,7 +32845,7 @@ en:edamame, edamame bean, edamame beans, edamame soybeans
 da:edamame bønner
 de:Edamame Bohnen
 fr:edamame, haricots edamame, fèves de soja edamame, edamame fèves, fève edamame
-ja:枝豆, えだ豆
+ja:枝豆, えだ豆, えだまめ
 nl:edamamebonen
 wikidata:en:Q1377879
 wikipedia:en:https://en.wikipedia.org/wiki/Edamame
@@ -33081,6 +33168,7 @@ fi:ravintohiiva
 fr:levure alimentaire
 id:ragi nutrisional
 it:lievito alimentare
+ja:イーストフード
 nl:edelgist
 pl:drożdże odżywcze
 ru:пищевые дрожжи
@@ -34865,6 +34953,7 @@ es:Zumo a partir de concentrado, zumo concentrado, jugo concentrado
 fi:mehutiiviste
 fr:jus concentré
 it:succo concentrato
+ja:濃縮果汁
 nl:sap uit vruchtensapconcentraat, geconcentreerd sap
 ru:концентрированные соки
 # ingredient/fr:jus-concentré has 184 products in 5 languages @2019-02-02
@@ -37481,6 +37570,42 @@ sv:naturlig citronarom
 <en:citrus fruit
 fr:agrumes à base de concentré
 
+###################################################################################################
+#
+#                                Citrus unshiu
+#
+###################################################################################################
+
+# description:en:The orange is the fruit of the citrus species Citrus × sinensis in the family Rutaceae
+
+<en:fruit
+<en:citrus fruit
+en:Citrus unshiu
+ar:برتقال ساتسوما
+bg:Сацума
+ca:Citrus unshiu
+cv:Уншиу (мандарин)
+de:Satsuma
+eo:Mikano
+es:Citrus unshiu
+fr:Mandarine satsuma
+it:Citrus unshiu
+ja:ウンシュウミカン, うんしゅうみかん
+ko:온주귤
+nl:Satsuma
+pl:Mandarynka Satsuma
+pt:Mikan
+ro:Mikan
+ru:Мандарин уншиу
+so:Liin Beydarin
+sv:Satsuma
+tr:Satsuma
+uk:Мандарин Уншіу
+vi:Satsuma
+zh:温州蜜柑
+wikidata:en:Q875262
+description:en:Citrus unshiu is a semi-seedless and easy-peeling citrus species, also known as miyagawa mandarin, unshu mikan, cold hardy mandarin, satsuma mandarin, satsuma orange, naartjie, and tangerine.
+
 ###################################################################################################
 #
 #                                Clementine
@@ -38506,7 +38631,7 @@ ht:mandarin
 hu:mandarin
 io:mandarino
 it:mandarino, mandarini
-ja:マンダリンオレンジ, うんしゅうみかん
+ja:マンダリンオレンジ
 lt:mandarina
 lv:mandarīn
 nb:mandarin
@@ -46702,6 +46827,7 @@ es:Pasta de ajo
 fi:valkosipulitahna
 fr:pâte d'ail, pulpe d'ail, ail en purée
 it:Impasto d'aglio
+# ja:ガーリックペースト # see ingredients_processings.txt
 pl:pasta czosnkowa
 # en:garlic-paste has 35 products in 2 languages @2018-10-23
 
@@ -46899,7 +47025,7 @@ cs:česnekový extrakt
 de:Knoblauchextrakt
 fi:valkosipuliuute
 fr:extrait d'ail
-ja:ガーリックエキス
+# ja:ガーリックエキス # see ingredients_processings.txt
 pl:ekstrakt czosnku, ekstrakt z czosnku
 # fr:extrait-d'ail has 71 products in 4 languages @2018-10-22
 
@@ -47406,6 +47532,18 @@ it:fibra di germoglio di bambù
 nl:vezels van bamboescheuten
 # ingredient/fr:fibres-de-pousses-de-bambou has 77 products in 5 languages @2019-02-03
 
+<en:bamboo
+en:Sasa veitchii
+ca:Sasa veitchii
+es:Sasa veitchii
+fr:Sasa veitchii
+is:Sasa veitchii
+ja:クマザサ
+sv:Sasa veitchii
+vi:Sasa veitchii
+wikidata:en:Q3015670
+description:en:large species of bamboo grass
+
 <en:vegetable fiber
 en:acacia fibre, acacia fibre
 de:Akazienfasern
@@ -49238,6 +49376,7 @@ wikidata:en:Q227997
 en:Konjac
 de:Konjak
 fr:Konjac
+ja:こんにゃく
 ro:konjac
 wikidata:en:Q674443
 description:en:Konjac is a common name of the East and Southeast Asian plant Amorphophallus konjac (syn. A. rivieri), which has an edible corm (bulbo-tuber).
@@ -51017,7 +51156,7 @@ id:Horenso
 io:Spinato
 is:Spínat
 it:spinaci
-ja:ホウレンソウ
+ja:ホウレンソウ, ほうれん草
 kk:Самалдық
 kn:ಪಾಲಕ್
 ko:시금치
@@ -51525,7 +51664,7 @@ ia:patata
 ik:Asiaġruaq
 io:Terpomo
 it:patata, patate
-ja:ジャガイモ, じゃがいも, 馬鈴薯
+ja:ジャガイモ, じゃがいも, 馬鈴薯, ポテト
 ka:კარტოფილი
 ks:اولُو
 la:Patata
@@ -54395,7 +54534,7 @@ es:Alubias rojas, judias rojas
 fi:punaiset kidneypavut, kidneypapu
 fr:haricot rouge, haricots rouges
 it:fagioli rossi
-ja:金時豆
+ja:金時豆, インゲン豆
 nl:Rode bonen
 pl:fasola czerwona, fasoli czerwonej
 pt:Feijões vermelhos
@@ -54914,6 +55053,20 @@ za:Lwglimz
 zh:紅豆
 wikidata:en:Q380279
 
+<en:legume
+en:Sweet bean paste
+ca:Pasta de mongetes
+es:Pasta de judía dulce
+fr:Pâte de haricots
+it:Pasta di fagioli
+ja:餡, こしあん
+jv:Pasta kacang legi
+ko:콩소
+pa:ਮਿੱਠੀ ਬੀਨ ਦਾ ਪੇਸਟ
+zh:豆沙
+wikidata:en:Q29340
+description:en:food ingredient used throughout East Asian cuisine, primarily as a filling for sweet desserts and pastries. 
+
 <en:legume
 en:cowpea, cowpeas
 ar:لوبياء ظفرية
@@ -56098,7 +56251,6 @@ sv:mandelpulver
 <en:almond paste
 en:prepacked Almond paste
 fr:Pâte d'amande préemballée
-ja:アーモンドペースト
 ciqual_food_code:en:15201
 ciqual_food_name:en:Almond paste or marzipan, prepacked
 ciqual_food_name:fr:Pâte d'amande, préemballée
@@ -56219,6 +56371,7 @@ fi:mantelitahna
 fr:pâte d'amande, pâte d'amandes, purée d'amande, purée d'amandes
 hr:pasta od badema, bademova pasta
 it:pasta di mandorle
+ja:アーモンドペースト
 pt:Pasta de amêndoa, pasta de amêndoas
 pl:pasta z migdałów, pasta migdałowa
 # openfoodfacts:https://world.openfoodfacts.org/ingredient/fr:pâte-d'amande
@@ -58723,6 +58876,41 @@ fr:assaisonnement goût salé
 <en:condiment
 fr:assaisonnement goût fromage
 
+
+###################################################################################################
+#
+#                                Annatto
+#
+###################################################################################################
+
+# see en:E160b in additives.txt
+#<en:condiment
+# en:Annatto
+# ar:أناتو
+# ca:Arxiota
+# de:Annatto
+# eo:Biksa kolorigilo
+# es:Achiote
+# et:Annaato
+# hu:Annatto
+# is:Annatto
+# it:Annatto
+# ja:アナトー
+# jv:Annatto
+# kn:ಅನಾಟೋ
+# ko:안나토
+# lt:Anatas
+# nl:Anatto
+# pl:Annato
+# pt:Anato
+# sl:Anato
+# sr:Anato
+# sv:Annatto
+# vi:Màu điều nhuộm
+# zh:胭脂樹紅
+# wikidata:en:Q425902
+# description:en:orange-red condiment and food coloring derived from the seeds of the achiote tree (Bixa orellana), native to tropical parts of the Americas.
+
 ###################################################################################################
 #
 #                                Miso
@@ -60348,7 +60536,7 @@ id:jahe
 io:Jinjero
 is:Engifer
 it:zenzero
-ja:ショウガ, しょうが, 生姜
+ja:ショウガ, しょうが, 生姜, ジンジャー
 jv:Jaé
 ka:ჯანჯაფილი
 kk:Жанжабіл, Зімбір
@@ -63769,6 +63957,7 @@ hr:pripravak od hmelja
 
 
 <en:plant
+en:jasmine petals
 fr:pétales de jasmin
 
 # description:en:JUNIPERS are coniferous plants in the genus Juniperus of the cypress family Cupressaceae. Juniper berries are a spice used in a wide variety of culinary dishes and best known for the primary flavoring in gin. Juniper berry sauce is often a popular flavoring choice for quail, pheasant, veal, rabbit, venison and other game dishes.
@@ -66720,9 +66909,18 @@ wikipedia:en:https://en.wikipedia.org/wiki/Yac%C3%B3n
 
 <en:plant
 en:Ashitaba
+es:Angelica keiskei
+id:Ashitaba
+it:Angelica keiskei
 ja:アシタバ, 明日葉, あしたば
+jv:Ashitaba
+ru:Angelica keiskei
+sv:Angelica keiskei
+vi:Angelica keiskei
+zh:明日叶
 wikidata:en:Q4805168
 wikipedia:en:https://en.wikipedia.org/wiki/Ashitaba
+description:en:species of flowering plant in the carrot family
 
 <en:plant
 en:Japanese hornwort
@@ -66748,6 +66946,44 @@ ja:ノザワナ, 野沢菜, のざわな
 wikidata:en:Q3049961
 wikipedia:en:https://en.wikipedia.org/wiki/Nozawana
 
+<en:plant
+en:Gardenia jasminoides
+ar:غردينية ياسمينية
+as:তগৰ
+az:Jasminəbənzər qardeniya
+be:Gardenia jasminoides
+bn:গন্ধরাজ
+ca:Gardenia jasminoides
+cs:Gardénie jasmínovitá
+de:Gardenie
+es:Gardenia jasminoides
+fa:گاردنیا
+fi:Kiinangardenia
+hi:अनंत वृक्ष
+id:Kacapiring
+it:Gardenia jasminoides
+ja:クチナシ
+jv:Ceplok piring
+ko:치자나무
+ml:ഗന്ധരാജൻ
+my:ဇီဇဝါ
+ne:इन्द्रकमल
+nl:Kaapse jasmijn
+no:Gardenia
+pl:Gardenia jaśminowata
+pt:Gardenia jasminoides
+ro:Gardenia jasminoides
+ru:Гардения жасминовидная
+su:Kacapiring
+ta:கும்பிலி
+th:พุดซ้อน
+to:Siale matalateau
+ty:Taina
+uz:Gardenia jasminoides
+vi:Dành dành
+zh:栀子花
+wikidata:en:Q1072101
+
 # description:en:Algae is an informal term for a large, diverse group of photosynthetic eukaryotic organisms that are not necessarily closely related, and is thus polyphyletic.
 
 en:algae
@@ -67238,7 +67474,7 @@ hy:կոմբու
 id:Kombu
 is:Kombu
 it:kombu
-ja:コンブ, 昆布
+ja:コンブ, 昆布, こんぶ
 ms:Kombu
 nl:Kombu
 pl:Kombu
@@ -67356,42 +67592,49 @@ ciqual_food_name:fr:Nori (Porphyra sp.), séchée ou déshydratée
 en:sea lettuce, green laver
 ar:أولفا خسية
 az:Ulva yosunu
+be:Ульва
 ca:enciam de mar
 cs:porost locikový
 da:Havsalat
-de:Meersalat
-es:lechuga de mar
-eu:Itsas uraza
-fi:merisalaatti
-fr:laitue de mer, laitue de mers
+de:Meersalat, ulva
+es:lechuga de mar, ulva
+eu:Itsas uraza, ulva
+fa:کاهوی دریایی
+fi:merisalaatti, Suolilevät
+fr:laitue de mer, laitue de mers, ulve
 ga:Glasán
 gd:Glasag
-gl:Leituga de mar
+gl:Leituga de mar, ulva
 hr:Morska salata
-hu:tengeri saláta
+hu:tengeri saláta, ulva
+id:ulva
 is:Maríusvunta
-it:lattuga di mare
+it:lattuga di mare, ulva
 ja:アオサ
 ka:ულვა
 ko:갈파래속
 la:Ulva sp.
 mk:морска марула
-nl:zeesla
-pl:Ulwa sałatowa
+nl:zeesla, ulva
+no:ulva
+pl:Ulwa sałatowa, ulva
 pt:Alface-do-mar
 ru:Ульва
-sv:Havssallat
-uk:Морський салат
-zh:石莼
+sv:Havssallat, ulva
+uk:Морський салат, Ульва
+uz:Ulva
+vi:Ulva
+zh:石莼, 石莼属
 # zh-hans:石莼
 # zh-hant:石蓴
 # zh-hk:石蓴
 # zh-tw:石蓴
+wikidata:en:Q1109330
 wikipedia:en:https://en.wikipedia.org/wiki/Sea_lettuce
 # ingredient/fr:laitue-de-mer has 73 products in 4 languages @2019-02-22
 # algues:laitue de mer
 ciqual_food_code:en:20985
-ciqual_food_name:en:Sea lettuce (ulva sp.), dried or dehydrated)
+ciqual_food_name:en:Sea lettuce (ulva sp.), dried or dehydrated
 ciqual_food_name:fr:Laitue de mer (Ulva sp.), séchée ou déshydratée
 
 
@@ -72072,6 +72315,33 @@ fr:préparation à base de surimi
 # ingredient/fr:préparation-à-base-de-surimi has 21 products in french @2019-02-03
 # préparation de surimi  (chair de poisson, stabilisants:sorbitol, polyphosphates)
 
+<en:surimi
+en:Kamaboko
+ar:كامبوكو
+da:Kamaboko
+de:Kamaboko
+es:Kamaboko
+fa:کالباس ماهی
+fr:Kamaboko
+id:Kamaboko
+it:Kamaboko
+ja:蒲鉾, かまぼこ
+jv:Kamaboko
+ko:가마보코
+ms:Kamaboko
+no:Kamaboko
+pt:Kamaboko
+ru:Камабоко
+sq:Kamaboko
+sv:Kamaboko
+th:คามาโบโกะ
+tr:Kamaboko
+uk:Камабоко
+vi:Kamaboko
+zh:蒲鉾
+wikidata:en:Q166204
+description:en:type of cured surimi, a processed seafood product common in Japanese cuisine
+
 <en:fish
 <en:white fish
 en:thread-fin bream
@@ -72336,8 +72606,32 @@ en:skipjack tuna fillet
 hr:fileti tune prugaste
 
 <en:skipjack tuna
-en:bonito flakes
+en:Katsuobushi, bonito flakes
+ar:كاتسوؤبوشي
+ca:Katsuobushi
+da:Katsuobushi
+de:Katsuobushi
+es:Katsuobushi
+fi:Katsuobushi
+fr:Katsuobushi
+id:Katsuobushi
+is:Katsuobushi
+it:Katsuobushi
 ja:鰹節, カツオ節, かつお節
+jv:Katsuobushi
+ko:가쓰오부시
+ms:Katsuobushi
+nl:Katsuobushi
+pt:Katsuobushi
+ru:Кацуобуси
+sv:Katsuobushi
+th:คัตสึโอบูชิ
+tr:Katsuobushi
+uk:Кацуобусі
+vi:Katsuobushi
+zh:鰹魚乾
+wikidata:en:Q113739
+description:en:simmered, smoked and fermented skipjack tuna
 
 #category/yellowfin-tunas
 <en:tuna
@@ -75150,7 +75444,7 @@ id:Kepiting
 io:Krabo
 is:Krabbar
 it:Granchio
-ja:カニ
+ja:カニ, かに
 jv:Kepithing
 ka:ცხრაფეხები
 kk:Таңқы шаян
@@ -75389,7 +75683,7 @@ id:Lobster
 io:Homardo
 is:Humrar
 it:Omaro
-ja:ロブスター
+ja:ロブスター, オマールエビ
 jv:Lobster
 ka:ჰომარი
 kk:Омарлар, Омар шаяны
@@ -78197,7 +78491,7 @@ io:hano
 is:Kjúklingur
 it:Polli, pollo
 iu:ᐊ'ᐊ'ᐋᒃ
-ja:ニワトリ
+ja:ニワトリ, チキン
 jv:Pitik
 ka:ქათამი
 kg:Nsusu
@@ -81708,6 +82002,12 @@ pl:makaron udon
 wikidata:en:Q471861
 wikipedia:en:https://en.wikipedia.org/wiki/Udon
 
+<en:noodle
+en:Alkaline noodles
+es:Kansui
+ja:かんすい
+wikidata:en:Q9017170
+description:en:variation of noodles with a much higher quantity of alkali than usual. The most common examples are Chinese Lamian noodles and Japanese Ramen noodles. 
 
 <en:dough
 en:shortcrust dough
@@ -82798,6 +83098,7 @@ fr:enrobage, enrobant, décor, decor, chemisage
 hr:preljev
 hu:bevonat, fűszerezés
 it:rivestimento
+ja:シーズニング
 lt:apvalkalas
 nb:belegg
 nl:coating
@@ -83860,7 +84161,7 @@ id:Kaldu
 io:Buliono
 is:seyði
 it:brodo
-ja:ブイヨン
+ja:ブイヨン, 出汁, だし
 ko:브로스
 lb:Britt
 li:Boeljóng
@@ -84001,7 +84302,7 @@ es:Caldo de pollo
 fi:kanaliemi
 fr:Bouillon de poulet, fond de poulet
 it:brodo di pollo
-ja:チキンスープ
+ja:チキンスープ, チキンブイヨン
 nl:Kippenbouillon
 pl:Rosół z kurczaka
 sv:kycklingbuljong, kycklingfond
@@ -85380,7 +85681,7 @@ hu:szójaszósz
 id:kecap
 is:sojasósa
 it:salsa di soia
-ja:醤油, しょうゆ
+ja:醤油, しょうゆ, 醤油たれ
 jv:kécap
 ka:სოიას სოუსი
 kk:соя соусы
@@ -85490,6 +85791,11 @@ wikidata:en:Q3514675
 # ingredient/fr:tamari has 84 products in 3 languages @2019-04-11
 # usage:nl: tamari (water, volle soja, zeezout, alcohol, fermentatiestarter)
 
+<en:soy sauce
+en:honjozo
+ja:本醸造
+wikipedia:en:https://en.wikipedia.org/wiki/Soy_sauce
+description:en:Honjōzō (本醸造, 'genuine fermented'): Contains 100% genuine fermented product
 
 # description:en:RÉMOULADE is a condiment invented in France that is usually aioli- or mayonnaise-based. Although similar to tartar sauce, it is often more yellowish, sometimes flavored with curry, and sometimes contains chopped pickles or piccalilli. It can also contain horseradish, paprika, anchovies, capers and a host of other items. While its original purpose was possibly for serving with meats, it is now more often used as a condiment or dipping sauce, primarily for sole, plaice, and seafood cakes (such as crab or salmon cakes).
 # comment:en:Translations with the word sauce in it are preferred
@@ -85938,6 +86244,11 @@ nl:sambal oelek
 pl:sambal oelek
 description:en:Raw chili paste (bright red, thin and sharp tasting). Can be used as the base for making other sambals or as an ingredient for other cuisines.
 
+<en:hot sauce
+en:Kanzuri
+ja:かんずり
+wikidata:en:Q11264544
+description:en:Japanese fermented chili paste manufactured in Niigata Prefecture
 
 #category/bearnaise-sauce
 <en:sauce
@@ -86417,6 +86728,7 @@ es:chile poblano
 
 en:xylose
 xx:xylose
+ja:キシロース
 wikipedia:en:https://en.wikipedia.org/wiki/Xylose
 
 # Tonka beans are prohibited for use in food in the US: https://www.govinfo.gov/content/pkg/CFR-2006-title21-vol3/xml/CFR-2006-title21-vol3-sec189-130.xml
diff --git a/taxonomies/ingredients_processing.txt b/taxonomies/ingredients_processing.txt
index 90f60fe62b3de..62a2d38cfd4d5 100644
--- a/taxonomies/ingredients_processing.txt
+++ b/taxonomies/ingredients_processing.txt
@@ -929,7 +929,7 @@ hr:koncentrirani ekstrakt
 #fr:pâte de, pâte d'
 #hr:pasta od
 #it:pasta di, pasta d'
-#ja:ペースト
+ja:ペースト
 #pl:pasta z
 #sv:pasta
 
diff --git a/taxonomies/minerals.txt b/taxonomies/minerals.txt
index 2856e746c0686..22c4ff354a954 100755
--- a/taxonomies/minerals.txt
+++ b/taxonomies/minerals.txt
@@ -2448,6 +2448,7 @@ fi:ferridifosfaatti, ferripyrofosfaatti
 fr:diphosphate ferrique, pyrophosphate ferrique, diphosphate de fer, pyrophosphate de fer
 hu:vas-difoszfát, ferri-pirofoszfát
 it:difosfato di ferro,  pirofosfato ferrico
+jp:ピロリン酸第二鉄, ピロリン酸鉄
 lt:geležies difosfatas, geležies pirofosfata
 lv:dzelzs difosfāts, dzelzs pirofosfāts
 mt:difosfat ferriku, pirofosfat ferriku
diff --git a/taxonomies/vitamins.txt b/taxonomies/vitamins.txt
index c0b5e3288bbb2..51d7ac55c49f6 100755
--- a/taxonomies/vitamins.txt
+++ b/taxonomies/vitamins.txt
@@ -23,7 +23,7 @@ fr:Vitamine A, vitamine Pro-A
 he:ויטמין A, רטינול
 hu:A-vitamin
 it:Vitamina A
-ja:ビタミン A
+ja:ビタミン A, v-a
 lt:Vitaminas A
 lv:A vitamīns
 mt:Vitamina A
@@ -239,7 +239,7 @@ hy:Վիտամին D
 id:Vitamin D
 is:D-vítamín
 it:vitamina D
-ja:ビタミンD
+ja:ビタミンD, ｖ．ｄ, v-d, ビタミン D
 ka:ვიტამინი D
 ko:비타민 D
 ky:Кальциферол
@@ -463,7 +463,7 @@ hu:E-vitamin, Tokoferol
 hy:Վիտամին E
 id:Vitamin E
 it:Vitamina E
-ja:ビタミン E
+ja:ビタミン E, ビタミンE, ビタミンｅ, ビタミンe, v-e
 jv:Vitamin E
 ka:ვიტამინი E
 kk:Е дәрумені
@@ -776,7 +776,7 @@ hy:Վիտամին C
 id:Vitamin C
 is:C-vítamín
 it:vitamina C
-ja:ビタミンC
+ja:ビタミンC, ｖ．ｃ, v-c, ビタミンｃ
 jv:Vitamin C
 ka:vitamine c
 kn:C ಜೀವ ಸತ್ವ
@@ -869,7 +869,7 @@ zh:抗坏血酸
 #scn:Ascurbatu
 
 <en:Vitamin C
-en:sodium-L-ascorbate, sodium ascorbate
+en:sodium-L-ascorbate, fscorbate
 bg:Натриев-L-аскорбат
 cs:L-askorbát sodný
 de:Natrium-L-ascorbat
@@ -995,7 +995,7 @@ hy:Թիամին, Վիտամին B1
 id:Tiamina, Vitamin B1
 is:Þíamín, B1-vítamín
 it:tiamina, vitamina B1
-ja:チアミン, ビタミンB1, ビタミン B1, V.B1
+ja:チアミン, ビタミンB1, ビタミン B1, V.B1, ｖ．ｂ１, v-b₁, ビタミンｂ１
 ko:티아민, 바이타민 B1
 ky:Витамин В1
 lb:Thiamin, Vitamin B1
@@ -1105,7 +1105,7 @@ fi:Riboflaviini
 fr:Riboflavine, Vitamine B2
 hu:Riboflavin, B2-vitamin
 it:Riboflavina
-ja:リボフラビン, ビタミンB2, V.B2
+ja:リボフラビン, ビタミンB2, V.B2, v-b₂, ビタミンｂ２
 lt:Riboflavinas
 lv:Riboflavīns
 nl:Riboflavine
@@ -1190,6 +1190,7 @@ fr:Vitamine B6, Pyridoxine
 hr:vitamin B6, B6
 hu:B6-vitamin, piridoxin
 it:Vitamina B6, piridoxina
+ja:ｖ．ｂ６, v-b6, v-b₆
 lt:Vitaminas B6
 lv:B6 vitamīns
 mt:Vitamina B6
@@ -1419,7 +1420,7 @@ hy:Վիտամին B12
 id:Vitamin B12
 is:B12-vítamín
 it:Cobalamina, vitamina B12
-ja:シアノコバラミン, ビタミン B12
+ja:シアノコバラミン, ビタミン B12, v-b12, v-b₁₂, ビタミンb12
 jv:Vitamin b12
 kk:Кобаламин
 ko:비타민 B12
@@ -1592,6 +1593,7 @@ fr:D-pantothénate de calcium,D- calcium pantothénate
 hr:kalcijev D-pantotenat
 hu:kalcium-D-pantotenát
 it:D-pantotenato calcio
+jp:パントテン酸ca, パントテン酸カルシウム
 lt:kalcio D-pantotenatas
 lv:kalcija D-pantotenāts
 mt:D-pantotenat kalċju
diff --git a/tests/integration/expected_test_results/create_pro_user/mails.json b/tests/integration/expected_test_results/create_pro_user/mails.json
index 014578d00a219..750337c82f108 100644
--- a/tests/integration/expected_test_results/create_pro_user/mails.json
+++ b/tests/integration/expected_test_results/create_pro_user/mails.json
@@ -176,4 +176,4 @@
       "lc: en",
       "cc: world"
    ]
-]
\ No newline at end of file
+]
diff --git a/tests/integration/expected_test_results/upload_images/get-image-too-small.json b/tests/integration/expected_test_results/upload_images/get-image-too-small.json
index 20527aba5db52..4f2b0d548b51a 100644
--- a/tests/integration/expected_test_results/upload_images/get-image-too-small.json
+++ b/tests/integration/expected_test_results/upload_images/get-image-too-small.json
@@ -1,92 +1,92 @@
-{
-        "code" : "1234567890013",
-        "product" : {
-          "_id" : "1234567890013",
-          "_keywords" : [],
-          "added_countries_tags" : [],
-          "checkers_tags" : [],
-          "code" : "1234567890013",
-          "codes_tags" : [
-            "code-13",
-            "1234567890xxx",
-            "123456789xxxx",
-            "12345678xxxxx",
-            "1234567xxxxxx",
-            "123456xxxxxxx",
-            "12345xxxxxxxx",
-            "1234xxxxxxxxx",
-            "123xxxxxxxxxx",
-            "12xxxxxxxxxxx",
-            "1xxxxxxxxxxxx"
-          ],
-          "complete" : 0,
-          "completeness" : 0,
-          "correctors_tags" : [],
-          "created_t" : "--ignore--",
-          "creator" : "openfoodfacts-contributors",
-          "editors_tags" : [
-            "openfoodfacts-contributors"
-          ],
-          "empty" : 1,
-          "entry_dates_tags" : "--ignore--",
-          "id" : "1234567890013",
-          "informers_tags" : [
-            "openfoodfacts-contributors"
-          ],
-          "interface_version_created" : "20120622",
-          "lang" : "en",
-          "languages" : {},
-          "languages_codes"  : {},
-          "languages_hierarchy"  : [],
-          "languages_tags"  : [
-            "en:0"
-          ],
-          "last_edit_dates_tags"  : "--ignore--",
-          "last_modified_t"  : "--ignore--",
-          "lc"  : "en",
-          "main_countries_tags"  : [],
-          "misc_tags"  : [
-            "en:main-countries-new-product"
-          ],
-          "photographers_tags"  : [],
-          "popularity_key"  : 0,
-          "removed_countries_tags"  : [],
-          "rev" : 1,
-          "states"  : "en:empty, en:to-be-completed, en:nutrition-facts-to-be-completed, en:ingredients-to-be-completed, en:expiration-date-to-be-completed, en:packaging-code-to-be-completed, en:characteristics-to-be-completed, en:origins-to-be-completed, en:categories-to-be-completed, en:brands-to-be-completed, en:packaging-to-be-completed, en:quantity-to-be-completed, en:product-name-to-be-completed, en:photos-to-be-uploaded",
-          "states_hierarchy"  : [
-            "en:empty",
-            "en:to-be-completed",
-            "en:nutrition-facts-to-be-completed",
-            "en:ingredients-to-be-completed",
-            "en:expiration-date-to-be-completed",
-            "en:packaging-code-to-be-completed",
-            "en:characteristics-to-be-completed",
-            "en:origins-to-be-completed",
-            "en:categories-to-be-completed",
-            "en:brands-to-be-completed",
-            "en:packaging-to-be-completed",
-            "en:quantity-to-be-completed",
-            "en:product-name-to-be-completed",
-            "en:photos-to-be-uploaded"
-          ],
-          "states_tags"  : [
-            "en:empty",
-            "en:to-be-completed",
-            "en:nutrition-facts-to-be-completed",
-            "en:ingredients-to-be-completed",
-            "en:expiration-date-to-be-completed",
-            "en:packaging-code-to-be-completed",
-            "en:characteristics-to-be-completed",
-            "en:origins-to-be-completed",
-            "en:categories-to-be-completed",
-            "en:brands-to-be-completed",
-            "en:packaging-to-be-completed",
-            "en:quantity-to-be-completed",
-            "en:product-name-to-be-completed",
-            "en:photos-to-be-uploaded"
-          ],
-          "weighers_tags"  : []
-        },
-        "status" : 1,
-        "status_verbose"  : "product found"
-      }
\ No newline at end of file
+{
+   "code" : "1234567890013",
+   "product" : {
+      "_id" : "1234567890013",
+      "_keywords" : [],
+      "added_countries_tags" : [],
+      "checkers_tags" : [],
+      "code" : "1234567890013",
+      "codes_tags" : [
+         "code-13",
+         "1234567890xxx",
+         "123456789xxxx",
+         "12345678xxxxx",
+         "1234567xxxxxx",
+         "123456xxxxxxx",
+         "12345xxxxxxxx",
+         "1234xxxxxxxxx",
+         "123xxxxxxxxxx",
+         "12xxxxxxxxxxx",
+         "1xxxxxxxxxxxx"
+      ],
+      "complete" : 0,
+      "completeness" : 0,
+      "correctors_tags" : [],
+      "created_t" : "--ignore--",
+      "creator" : "openfoodfacts-contributors",
+      "editors_tags" : [
+         "openfoodfacts-contributors"
+      ],
+      "empty" : 1,
+      "entry_dates_tags" : "--ignore--",
+      "id" : "1234567890013",
+      "informers_tags" : [
+         "openfoodfacts-contributors"
+      ],
+      "interface_version_created" : "20120622",
+      "lang" : "en",
+      "languages" : {},
+      "languages_codes" : {},
+      "languages_hierarchy" : [],
+      "languages_tags" : [
+         "en:0"
+      ],
+      "last_edit_dates_tags" : "--ignore--",
+      "last_modified_t" : "--ignore--",
+      "lc" : "en",
+      "main_countries_tags" : [],
+      "misc_tags" : [
+         "en:main-countries-new-product"
+      ],
+      "photographers_tags" : [],
+      "popularity_key" : 0,
+      "removed_countries_tags" : [],
+      "rev" : 1,
+      "states" : "en:empty, en:to-be-completed, en:nutrition-facts-to-be-completed, en:ingredients-to-be-completed, en:expiration-date-to-be-completed, en:packaging-code-to-be-completed, en:characteristics-to-be-completed, en:origins-to-be-completed, en:categories-to-be-completed, en:brands-to-be-completed, en:packaging-to-be-completed, en:quantity-to-be-completed, en:product-name-to-be-completed, en:photos-to-be-uploaded",
+      "states_hierarchy" : [
+         "en:empty",
+         "en:to-be-completed",
+         "en:nutrition-facts-to-be-completed",
+         "en:ingredients-to-be-completed",
+         "en:expiration-date-to-be-completed",
+         "en:packaging-code-to-be-completed",
+         "en:characteristics-to-be-completed",
+         "en:origins-to-be-completed",
+         "en:categories-to-be-completed",
+         "en:brands-to-be-completed",
+         "en:packaging-to-be-completed",
+         "en:quantity-to-be-completed",
+         "en:product-name-to-be-completed",
+         "en:photos-to-be-uploaded"
+      ],
+      "states_tags" : [
+         "en:empty",
+         "en:to-be-completed",
+         "en:nutrition-facts-to-be-completed",
+         "en:ingredients-to-be-completed",
+         "en:expiration-date-to-be-completed",
+         "en:packaging-code-to-be-completed",
+         "en:characteristics-to-be-completed",
+         "en:origins-to-be-completed",
+         "en:categories-to-be-completed",
+         "en:brands-to-be-completed",
+         "en:packaging-to-be-completed",
+         "en:quantity-to-be-completed",
+         "en:product-name-to-be-completed",
+         "en:photos-to-be-uploaded"
+      ],
+      "weighers_tags" : []
+   },
+   "status" : 1,
+   "status_verbose" : "product found"
+}
diff --git a/tests/integration/expected_test_results/upload_images/get-missing-imagefield.json b/tests/integration/expected_test_results/upload_images/get-missing-imagefield.json
index 95eba73cf146b..a08328de2b8f4 100644
--- a/tests/integration/expected_test_results/upload_images/get-missing-imagefield.json
+++ b/tests/integration/expected_test_results/upload_images/get-missing-imagefield.json
@@ -1,5 +1,5 @@
-{
-       "code" : "1234567890015",
-       "status" : 0,
-       "status_verbose" : "product not found"
-     }
\ No newline at end of file
+{
+   "code" : "1234567890015",
+   "status" : 0,
+   "status_verbose" : "product not found"
+}
diff --git a/tests/integration/expected_test_results/upload_images/get-missing-imgupload_[imagefield].json b/tests/integration/expected_test_results/upload_images/get-missing-imgupload_[imagefield].json
index 0beaa3a09fed8..d70d6941c853b 100644
--- a/tests/integration/expected_test_results/upload_images/get-missing-imgupload_[imagefield].json
+++ b/tests/integration/expected_test_results/upload_images/get-missing-imgupload_[imagefield].json
@@ -1,92 +1,92 @@
-{
-    "code" : "1234567890016",
-    "product" : {
-      "_id" : "1234567890016",
-      "_keywords" : [],
-      "added_countries_tags" : [],
-      "checkers_tags" : [],
-      "code" : "1234567890016",
-      "codes_tags" : [
-        "code-13",
-        "1234567890xxx",
-        "123456789xxxx",
-        "12345678xxxxx",
-        "1234567xxxxxx",
-        "123456xxxxxxx",
-        "12345xxxxxxxx",
-        "1234xxxxxxxxx",
-        "123xxxxxxxxxx",
-        "12xxxxxxxxxxx",
-        "1xxxxxxxxxxxx"
-      ],
-      "complete" : 0,
-      "completeness" : 0,
-      "correctors_tags" : [],
-      "created_t" : "--ignore--",
-      "creator" : "openfoodfacts-contributors",
-      "editors_tags" : [
-        "openfoodfacts-contributors"
-      ],
-      "empty" : 1,
-      "entry_dates_tags" : "--ignore--",
-      "id" : "1234567890016",
-      "informers_tags" : [
-        "openfoodfacts-contributors"
-      ],
-      "interface_version_created" : "20120622",
-      "lang" : "en",
-      "languages" : {},
-      "languages_codes" : {},
-      "languages_hierarchy" : [],
-      "languages_tags" : [
-        "en:0"
-      ],
-      "last_edit_dates_tags" : "--ignore--",
-      "last_modified_t" : "--ignore--",
-      "lc" : "en",
-      "main_countries_tags" : [],
-      "misc_tags" : [
-        "en:main-countries-new-product"
-      ],
-      "photographers_tags" : [],
-      "popularity_key" : 0,
-      "removed_countries_tags" : [],
-      "rev" : 1,
-      "states" : "en:empty, en:to-be-completed, en:nutrition-facts-to-be-completed, en:ingredients-to-be-completed, en:expiration-date-to-be-completed, en:packaging-code-to-be-completed, en:characteristics-to-be-completed, en:origins-to-be-completed, en:categories-to-be-completed, en:brands-to-be-completed, en:packaging-to-be-completed, en:quantity-to-be-completed, en:product-name-to-be-completed, en:photos-to-be-uploaded",
-      "states_hierarchy" : [
-        "en:empty",
-        "en:to-be-completed",
-        "en:nutrition-facts-to-be-completed",
-        "en:ingredients-to-be-completed",
-        "en:expiration-date-to-be-completed",
-        "en:packaging-code-to-be-completed",
-        "en:characteristics-to-be-completed",
-        "en:origins-to-be-completed",
-        "en:categories-to-be-completed",
-        "en:brands-to-be-completed",
-        "en:packaging-to-be-completed",
-        "en:quantity-to-be-completed",
-        "en:product-name-to-be-completed",
-        "en:photos-to-be-uploaded"
-      ],
-      "states_tags" : [
-        "en:empty",
-        "en:to-be-completed",
-        "en:nutrition-facts-to-be-completed",
-        "en:ingredients-to-be-completed",
-        "en:expiration-date-to-be-completed",
-        "en:packaging-code-to-be-completed",
-        "en:characteristics-to-be-completed",
-        "en:origins-to-be-completed",
-        "en:categories-to-be-completed",
-        "en:brands-to-be-completed",
-        "en:packaging-to-be-completed",
-        "en:quantity-to-be-completed",
-        "en:product-name-to-be-completed",
-        "en:photos-to-be-uploaded"
-      ],
-      "weighers_tags" : []
-    },
-    "status" : 1,
-    "status_verbose" : "product found"
-  }
\ No newline at end of file
+{
+   "code" : "1234567890016",
+   "product" : {
+      "_id" : "1234567890016",
+      "_keywords" : [],
+      "added_countries_tags" : [],
+      "checkers_tags" : [],
+      "code" : "1234567890016",
+      "codes_tags" : [
+         "code-13",
+         "1234567890xxx",
+         "123456789xxxx",
+         "12345678xxxxx",
+         "1234567xxxxxx",
+         "123456xxxxxxx",
+         "12345xxxxxxxx",
+         "1234xxxxxxxxx",
+         "123xxxxxxxxxx",
+         "12xxxxxxxxxxx",
+         "1xxxxxxxxxxxx"
+      ],
+      "complete" : 0,
+      "completeness" : 0,
+      "correctors_tags" : [],
+      "created_t" : "--ignore--",
+      "creator" : "openfoodfacts-contributors",
+      "editors_tags" : [
+         "openfoodfacts-contributors"
+      ],
+      "empty" : 1,
+      "entry_dates_tags" : "--ignore--",
+      "id" : "1234567890016",
+      "informers_tags" : [
+         "openfoodfacts-contributors"
+      ],
+      "interface_version_created" : "20120622",
+      "lang" : "en",
+      "languages" : {},
+      "languages_codes" : {},
+      "languages_hierarchy" : [],
+      "languages_tags" : [
+         "en:0"
+      ],
+      "last_edit_dates_tags" : "--ignore--",
+      "last_modified_t" : "--ignore--",
+      "lc" : "en",
+      "main_countries_tags" : [],
+      "misc_tags" : [
+         "en:main-countries-new-product"
+      ],
+      "photographers_tags" : [],
+      "popularity_key" : 0,
+      "removed_countries_tags" : [],
+      "rev" : 1,
+      "states" : "en:empty, en:to-be-completed, en:nutrition-facts-to-be-completed, en:ingredients-to-be-completed, en:expiration-date-to-be-completed, en:packaging-code-to-be-completed, en:characteristics-to-be-completed, en:origins-to-be-completed, en:categories-to-be-completed, en:brands-to-be-completed, en:packaging-to-be-completed, en:quantity-to-be-completed, en:product-name-to-be-completed, en:photos-to-be-uploaded",
+      "states_hierarchy" : [
+         "en:empty",
+         "en:to-be-completed",
+         "en:nutrition-facts-to-be-completed",
+         "en:ingredients-to-be-completed",
+         "en:expiration-date-to-be-completed",
+         "en:packaging-code-to-be-completed",
+         "en:characteristics-to-be-completed",
+         "en:origins-to-be-completed",
+         "en:categories-to-be-completed",
+         "en:brands-to-be-completed",
+         "en:packaging-to-be-completed",
+         "en:quantity-to-be-completed",
+         "en:product-name-to-be-completed",
+         "en:photos-to-be-uploaded"
+      ],
+      "states_tags" : [
+         "en:empty",
+         "en:to-be-completed",
+         "en:nutrition-facts-to-be-completed",
+         "en:ingredients-to-be-completed",
+         "en:expiration-date-to-be-completed",
+         "en:packaging-code-to-be-completed",
+         "en:characteristics-to-be-completed",
+         "en:origins-to-be-completed",
+         "en:categories-to-be-completed",
+         "en:brands-to-be-completed",
+         "en:packaging-to-be-completed",
+         "en:quantity-to-be-completed",
+         "en:product-name-to-be-completed",
+         "en:photos-to-be-uploaded"
+      ],
+      "weighers_tags" : []
+   },
+   "status" : 1,
+   "status_verbose" : "product found"
+}
diff --git a/tests/integration/expected_test_results/upload_images/get-same-image-twice.json b/tests/integration/expected_test_results/upload_images/get-same-image-twice.json
index 015df4002bda9..82803d970443e 100644
--- a/tests/integration/expected_test_results/upload_images/get-same-image-twice.json
+++ b/tests/integration/expected_test_results/upload_images/get-same-image-twice.json
@@ -1,181 +1,181 @@
-{
-         "code"  :  "1234567890014" ,
-         "product"  : {
-           "_id" : "1234567890014",
-           "_keywords" : [],
-           "added_countries_tags"  : [],
-           "checkers_tags"  : [],
-           "code"  :  "1234567890014" ,
-           "codes_tags"  : [
-             "code-13" ,
-             "1234567890xxx" ,
-             "123456789xxxx" ,
-             "12345678xxxxx" ,
-             "1234567xxxxxx" ,
-             "123456xxxxxxx" ,
-             "12345xxxxxxxx" ,
-             "1234xxxxxxxxx" ,
-             "123xxxxxxxxxx" ,
-             "12xxxxxxxxxxx" ,
-             "1xxxxxxxxxxxx" 
-          ],
-           "complete"  : 0,
-           "completeness"  :  0.0625 ,
-           "correctors_tags"  : [],
-           "created_t"  :  "--ignore--" ,
-           "creator"  :  "openfoodfacts-contributors" ,
-           "editors_tags"  : [
-            "openfoodfacts-contributors"
-          ],
-           "entry_dates_tags"  :  "--ignore--" ,
-           "id"  :  "1234567890014" ,
-           "image_front_small_url"  :  "http://images.openfoodfacts.localhost/images/products/123/456/789/0014/front_en.3.200.jpg" ,
-           "image_front_thumb_url"  :  "http://images.openfoodfacts.localhost/images/products/123/456/789/0014/front_en.3.100.jpg" ,
-           "image_front_url"  :  "http://images.openfoodfacts.localhost/images/products/123/456/789/0014/front_en.3.400.jpg" ,
-           "image_small_url"  :  "http://images.openfoodfacts.localhost/images/products/123/456/789/0014/front_en.3.200.jpg" ,
-           "image_thumb_url"  :  "http://images.openfoodfacts.localhost/images/products/123/456/789/0014/front_en.3.100.jpg" ,
-           "image_url"  :  "http://images.openfoodfacts.localhost/images/products/123/456/789/0014/front_en.3.400.jpg",
-           "images"  : {
-             "1"  : {
-               "sizes"  : {
-                 "100"  : {
-                   "h"  : 92,
-                   "w"  : 100
-                },
-                 "400"  : {
-                   "h"  : 183,
-                   "w"  : 200
-                },
-                 "full"  : {
-                   "h"  : 183,
-                   "w"  : 200
-                }
-              },
-               "uploaded_t"  :  "--ignore--" ,
-               "uploader"  :  "openfoodfacts-contributors" 
-            },
-             "front_en"  : {
-               "angle"  : 0,
-               "coordinates_image_size"  :  "full" ,
-               "geometry"  :  "0x0--1--1" ,
-               "imgid"  :  "1" ,
-               "normalize"  : null,
-               "rev"  :  "3" ,
-               "sizes"  : {
-                 "100"  : {
-                   "h"  : 92,
-                   "w"  : 100
-                },
-                 "200"  : {
-                   "h"  : 183,
-                   "w"  : 200
-                },
-                 "400"  : {
-                   "h"  : 183,
-                   "w"  : 200
-                },
-                 "full"  : {
-                   "h"  : 183,
-                   "w"  : 200
-                }
-              },
-               "white_magic"  : null,
-               "x1"  :  -1 ,
-               "x2"  :  -1 ,
-               "y1"  :  -1 ,
-               "y2"  :  -1 
-            }
-          },
-           "informers_tags"  : [
-             "openfoodfacts-contributors" 
-          ],
-           "interface_version_created"  :  20120622 ,
-           "lang"  :  "en" ,
-           "languages"  : {
-             "en:english"  : 1
-          },
-           "languages_codes"  : {
-             "en"  : 1
-          },
-           "languages_hierarchy"  : [
-             "en:english" 
-          ],
-           "languages_tags"  : [
-             "en:english" ,
-             "en:1" 
-          ],
-           "last_edit_dates_tags"  :  "--ignore--" ,
-           "last_image_dates_tags"  :  "--ignore--" ,
-           "last_image_t"  :  "--ignore--" ,
-           "last_modified_t"  : "--ignore--" ,
-           "lc"  :  "en" ,
-           "main_countries_tags"  : [],
-           "max_imgid"  :  1 ,
-           "misc_tags"  : [
-             "en:main-countries-new-product" 
-          ],
-           "photographers_tags"  : [
-             "openfoodfacts-contributors"
-          ],
-           "popularity_key"  : 12,
-           "removed_countries_tags"  : [],
-           "rev"  : 3,
-           "selected_images"  : {
-             "front"  : {
-               "display"  : {
-                 "en"  :  "http://images.openfoodfacts.localhost/images/products/123/456/789/0014/front_en.3.400.jpg" 
-              },
-               "small"  : {
-                 "en"  :  "http://images.openfoodfacts.localhost/images/products/123/456/789/0014/front_en.3.200.jpg" 
-              },
-               "thumb"  : {
-                "en"  :  "http://images.openfoodfacts.localhost/images/products/123/456/789/0014/front_en.3.100.jpg" 
-              }
-            }
-          },
-           "states"  :  "en:to-be-completed, en:nutrition-facts-to-be-completed, en:ingredients-to-be-completed, en:expiration-date-to-be-completed, en:packaging-code-to-be-completed, en:characteristics-to-be-completed, en:origins-to-be-completed, en:categories-to-be-completed, en:brands-to-be-completed, en:packaging-to-be-completed, en:quantity-to-be-completed, en:product-name-to-be-completed, en:photos-to-be-validated, en:packaging-photo-to-be-selected, en:nutrition-photo-to-be-selected, en:ingredients-photo-to-be-selected, en:front-photo-selected, en:photos-uploaded" ,
-           "states_hierarchy"  : [
-             "en:to-be-completed" ,
-             "en:nutrition-facts-to-be-completed" ,
-             "en:ingredients-to-be-completed" ,
-             "en:expiration-date-to-be-completed" ,
-             "en:packaging-code-to-be-completed" ,
-             "en:characteristics-to-be-completed" ,
-             "en:origins-to-be-completed" ,
-             "en:categories-to-be-completed" ,
-             "en:brands-to-be-completed" ,
-             "en:packaging-to-be-completed" ,
-             "en:quantity-to-be-completed" ,
-             "en:product-name-to-be-completed" ,
-             "en:photos-to-be-validated" ,
-             "en:packaging-photo-to-be-selected" ,
-             "en:nutrition-photo-to-be-selected" ,
-             "en:ingredients-photo-to-be-selected" ,
-             "en:front-photo-selected" ,
-             "en:photos-uploaded" 
-          ],
-           "states_tags"  : [
-             "en:to-be-completed",
-             "en:nutrition-facts-to-be-completed" ,
-             "en:ingredients-to-be-completed" ,
-             "en:expiration-date-to-be-completed" ,
-             "en:packaging-code-to-be-completed" ,
-             "en:characteristics-to-be-completed" ,
-             "en:origins-to-be-completed" ,
-             "en:categories-to-be-completed" ,
-             "en:brands-to-be-completed" ,
-             "en:packaging-to-be-completed" ,
-             "en:quantity-to-be-completed" ,
-             "en:product-name-to-be-completed" ,
-             "en:photos-to-be-validated" ,
-             "en:packaging-photo-to-be-selected" ,
-             "en:nutrition-photo-to-be-selected" ,
-             "en:ingredients-photo-to-be-selected" ,
-             "en:front-photo-selected" ,
-             "en:photos-uploaded" 
-          ],
-           "weighers_tags"  : []
-        },
-         "status"  : 1,
-         "status_verbose"  :  "product found" 
-      }
\ No newline at end of file
+{
+   "code" : "1234567890014",
+   "product" : {
+      "_id" : "1234567890014",
+      "_keywords" : [],
+      "added_countries_tags" : [],
+      "checkers_tags" : [],
+      "code" : "1234567890014",
+      "codes_tags" : [
+         "code-13",
+         "1234567890xxx",
+         "123456789xxxx",
+         "12345678xxxxx",
+         "1234567xxxxxx",
+         "123456xxxxxxx",
+         "12345xxxxxxxx",
+         "1234xxxxxxxxx",
+         "123xxxxxxxxxx",
+         "12xxxxxxxxxxx",
+         "1xxxxxxxxxxxx"
+      ],
+      "complete" : 0,
+      "completeness" : 0.0625,
+      "correctors_tags" : [],
+      "created_t" : "--ignore--",
+      "creator" : "openfoodfacts-contributors",
+      "editors_tags" : [
+         "openfoodfacts-contributors"
+      ],
+      "entry_dates_tags" : "--ignore--",
+      "id" : "1234567890014",
+      "image_front_small_url" : "http://images.openfoodfacts.localhost/images/products/123/456/789/0014/front_en.3.200.jpg",
+      "image_front_thumb_url" : "http://images.openfoodfacts.localhost/images/products/123/456/789/0014/front_en.3.100.jpg",
+      "image_front_url" : "http://images.openfoodfacts.localhost/images/products/123/456/789/0014/front_en.3.400.jpg",
+      "image_small_url" : "http://images.openfoodfacts.localhost/images/products/123/456/789/0014/front_en.3.200.jpg",
+      "image_thumb_url" : "http://images.openfoodfacts.localhost/images/products/123/456/789/0014/front_en.3.100.jpg",
+      "image_url" : "http://images.openfoodfacts.localhost/images/products/123/456/789/0014/front_en.3.400.jpg",
+      "images" : {
+         "1" : {
+            "sizes" : {
+               "100" : {
+                  "h" : 92,
+                  "w" : 100
+               },
+               "400" : {
+                  "h" : 183,
+                  "w" : 200
+               },
+               "full" : {
+                  "h" : 183,
+                  "w" : 200
+               }
+            },
+            "uploaded_t" : "--ignore--",
+            "uploader" : "openfoodfacts-contributors"
+         },
+         "front_en" : {
+            "angle" : 0,
+            "coordinates_image_size" : "full",
+            "geometry" : "0x0--1--1",
+            "imgid" : "1",
+            "normalize" : null,
+            "rev" : "3",
+            "sizes" : {
+               "100" : {
+                  "h" : 92,
+                  "w" : 100
+               },
+               "200" : {
+                  "h" : 183,
+                  "w" : 200
+               },
+               "400" : {
+                  "h" : 183,
+                  "w" : 200
+               },
+               "full" : {
+                  "h" : 183,
+                  "w" : 200
+               }
+            },
+            "white_magic" : null,
+            "x1" : "-1",
+            "x2" : "-1",
+            "y1" : "-1",
+            "y2" : "-1"
+         }
+      },
+      "informers_tags" : [
+         "openfoodfacts-contributors"
+      ],
+      "interface_version_created" : "20120622",
+      "lang" : "en",
+      "languages" : {
+         "en:english" : 1
+      },
+      "languages_codes" : {
+         "en" : 1
+      },
+      "languages_hierarchy" : [
+         "en:english"
+      ],
+      "languages_tags" : [
+         "en:english",
+         "en:1"
+      ],
+      "last_edit_dates_tags" : "--ignore--",
+      "last_image_dates_tags" : "--ignore--",
+      "last_image_t" : "--ignore--",
+      "last_modified_t" : "--ignore--",
+      "lc" : "en",
+      "main_countries_tags" : [],
+      "max_imgid" : "1",
+      "misc_tags" : [
+         "en:main-countries-new-product"
+      ],
+      "photographers_tags" : [
+         "openfoodfacts-contributors"
+      ],
+      "popularity_key" : 12,
+      "removed_countries_tags" : [],
+      "rev" : 3,
+      "selected_images" : {
+         "front" : {
+            "display" : {
+               "en" : "http://images.openfoodfacts.localhost/images/products/123/456/789/0014/front_en.3.400.jpg"
+            },
+            "small" : {
+               "en" : "http://images.openfoodfacts.localhost/images/products/123/456/789/0014/front_en.3.200.jpg"
+            },
+            "thumb" : {
+               "en" : "http://images.openfoodfacts.localhost/images/products/123/456/789/0014/front_en.3.100.jpg"
+            }
+         }
+      },
+      "states" : "en:to-be-completed, en:nutrition-facts-to-be-completed, en:ingredients-to-be-completed, en:expiration-date-to-be-completed, en:packaging-code-to-be-completed, en:characteristics-to-be-completed, en:origins-to-be-completed, en:categories-to-be-completed, en:brands-to-be-completed, en:packaging-to-be-completed, en:quantity-to-be-completed, en:product-name-to-be-completed, en:photos-to-be-validated, en:packaging-photo-to-be-selected, en:nutrition-photo-to-be-selected, en:ingredients-photo-to-be-selected, en:front-photo-selected, en:photos-uploaded",
+      "states_hierarchy" : [
+         "en:to-be-completed",
+         "en:nutrition-facts-to-be-completed",
+         "en:ingredients-to-be-completed",
+         "en:expiration-date-to-be-completed",
+         "en:packaging-code-to-be-completed",
+         "en:characteristics-to-be-completed",
+         "en:origins-to-be-completed",
+         "en:categories-to-be-completed",
+         "en:brands-to-be-completed",
+         "en:packaging-to-be-completed",
+         "en:quantity-to-be-completed",
+         "en:product-name-to-be-completed",
+         "en:photos-to-be-validated",
+         "en:packaging-photo-to-be-selected",
+         "en:nutrition-photo-to-be-selected",
+         "en:ingredients-photo-to-be-selected",
+         "en:front-photo-selected",
+         "en:photos-uploaded"
+      ],
+      "states_tags" : [
+         "en:to-be-completed",
+         "en:nutrition-facts-to-be-completed",
+         "en:ingredients-to-be-completed",
+         "en:expiration-date-to-be-completed",
+         "en:packaging-code-to-be-completed",
+         "en:characteristics-to-be-completed",
+         "en:origins-to-be-completed",
+         "en:categories-to-be-completed",
+         "en:brands-to-be-completed",
+         "en:packaging-to-be-completed",
+         "en:quantity-to-be-completed",
+         "en:product-name-to-be-completed",
+         "en:photos-to-be-validated",
+         "en:packaging-photo-to-be-selected",
+         "en:nutrition-photo-to-be-selected",
+         "en:ingredients-photo-to-be-selected",
+         "en:front-photo-selected",
+         "en:photos-uploaded"
+      ],
+      "weighers_tags" : []
+   },
+   "status" : 1,
+   "status_verbose" : "product found"
+}
diff --git a/tests/integration/expected_test_results/upload_images/post-image-too-small.json b/tests/integration/expected_test_results/upload_images/post-image-too-small.json
index 8e98e315ff874..5dff22d7e269c 100644
--- a/tests/integration/expected_test_results/upload_images/post-image-too-small.json
+++ b/tests/integration/expected_test_results/upload_images/post-image-too-small.json
@@ -1,16 +1,16 @@
-{
-        "code"  : "1234567890013",
-        "debug"  : "product_id: 1234567890013 - user_id:  - imagefield: front_en - size of image file received: 909 - saved jpg: 288 - image too small - width: 4 - height: 4",
-        "error"  : "The picture is too small. Please do not upload pictures found on the Internet and only send photos you have taken yourself.",
-        "files"  : [
-          {
-            "code"  : "1234567890013",
-            "filename"  : "",
-            "name"  : "1234567890013",
-            "url"  : "/product/1234567890013"
-          }
-        ],
-        "imagefield"  : "front_en",
-        "imgid":  null,
-        "status"  : "status not ok"
-      }
\ No newline at end of file
+{
+   "code" : "1234567890013",
+   "debug" : "product_id: 1234567890013 - user_id:  - imagefield: front_en - size of image file received: 909 - saved jpg: 288 - image too small - width: 4 - height: 4",
+   "error" : "The picture is too small. Please do not upload pictures found on the Internet and only send photos you have taken yourself.",
+   "files" : [
+      {
+         "code" : "1234567890013",
+         "filename" : "",
+         "name" : "1234567890013",
+         "url" : "/product/1234567890013"
+      }
+   ],
+   "imagefield" : "front_en",
+   "imgid" : null,
+   "status" : "status not ok"
+}
diff --git a/tests/integration/expected_test_results/upload_images/post-missing-imagefield.json b/tests/integration/expected_test_results/upload_images/post-missing-imagefield.json
index 1d95af5c0a4e5..4d6ff2dcbc76c 100644
--- a/tests/integration/expected_test_results/upload_images/post-missing-imagefield.json
+++ b/tests/integration/expected_test_results/upload_images/post-missing-imagefield.json
@@ -1,10 +1,10 @@
-{
-    "code" : "1234567890015",
-       "error" : "error - imagefield not defined",
-       "files" : [
-         {
-           "filename" : ""
-         }
-       ],
-       "status" : "status not ok"
-     }
\ No newline at end of file
+{
+   "code" : "1234567890015",
+   "error" : "error - imagefield not defined",
+   "files" : [
+      {
+         "filename" : ""
+      }
+   ],
+   "status" : "status not ok"
+}
diff --git a/tests/integration/expected_test_results/upload_images/post-missing-imgupload_[imagefield].json b/tests/integration/expected_test_results/upload_images/post-missing-imgupload_[imagefield].json
index bd3682f571a0b..741b48d6e6340 100644
--- a/tests/integration/expected_test_results/upload_images/post-missing-imgupload_[imagefield].json
+++ b/tests/integration/expected_test_results/upload_images/post-missing-imgupload_[imagefield].json
@@ -1,16 +1,16 @@
-{
-    "code" : "1234567890016",
-    "debug" : "product_id: 1234567890016 - user_id:  - imagefield: front_en - no image file for field name imgupload_front_en",
-    "error" : "field imgupload_front_en not set",
-    "files" : [
-      {
-        "code" : "1234567890016",
-        "filename" : "",
-        "name" : "1234567890016",
-        "url" : "/product/1234567890016"
-      }
-    ],
-    "imagefield" : "front_en",
-    "imgid" : -2,
-    "status" : "status not ok"
-  } 
\ No newline at end of file
+{
+   "code" : "1234567890016",
+   "debug" : "product_id: 1234567890016 - user_id:  - imagefield: front_en - no image file for field name imgupload_front_en",
+   "error" : "field imgupload_front_en not set",
+   "files" : [
+      {
+         "code" : "1234567890016",
+         "filename" : "",
+         "name" : "1234567890016",
+         "url" : "/product/1234567890016"
+      }
+   ],
+   "imagefield" : "front_en",
+   "imgid" : -2,
+   "status" : "status not ok"
+}
diff --git a/tests/integration/expected_test_results/upload_images/post-same-image-twice-duplicate.json b/tests/integration/expected_test_results/upload_images/post-same-image-twice-duplicate.json
index 9271f47756f5e..aa73d8438523b 100644
--- a/tests/integration/expected_test_results/upload_images/post-same-image-twice-duplicate.json
+++ b/tests/integration/expected_test_results/upload_images/post-same-image-twice-duplicate.json
@@ -1,17 +1,17 @@
-{
-    "code" : "1234567890014",
-    "debug" : "product_id: 1234567890014 - user_id:  - imagefield: front_en - we have already received an image with this file size: 18145 - imgid: 1",
-    "error" : "This picture has already been sent.",
-    "files" : [
-      {
-        "code" : "1234567890014",
-        "filename" : "",
-        "name" : "1234567890014",
-        "thumbnailUrl" : "/images/products/123/456/789/0014/1.100.jpg",
-        "url" : "/product/1234567890014"
-      }
-    ],
-    "imagefield" : "front_en",
-    "imgid" : "1",
-    "status" : "status not ok"
-  }
\ No newline at end of file
+{
+   "code" : "1234567890014",
+   "debug" : "product_id: 1234567890014 - user_id:  - imagefield: front_en - we have already received an image with this file size: 18145 - imgid: 1",
+   "error" : "This picture has already been sent.",
+   "files" : [
+      {
+         "code" : "1234567890014",
+         "filename" : "",
+         "name" : "1234567890014",
+         "thumbnailUrl" : "/images/products/123/456/789/0014/1.100.jpg",
+         "url" : "/product/1234567890014"
+      }
+   ],
+   "imagefield" : "front_en",
+   "imgid" : "1",
+   "status" : "status not ok"
+}
diff --git a/tests/integration/expected_test_results/upload_images/post-same-image-twice.json b/tests/integration/expected_test_results/upload_images/post-same-image-twice.json
index ca4fbb6be9b71..f92fd0af6f869 100644
--- a/tests/integration/expected_test_results/upload_images/post-same-image-twice.json
+++ b/tests/integration/expected_test_results/upload_images/post-same-image-twice.json
@@ -1,20 +1,20 @@
-{
-         "code"  :  "1234567890014",
-         "files"  : [
-          {
-             "code"  :  "1234567890014",
-             "filename"  :  "",
-             "name"  :  "1234567890014",
-             "thumbnailUrl"  :  "/images/products/123/456/789/0014/1.100.jpg",
-             "url"  :  "/product/1234567890014"
-          }
-        ],
-         "image"  : {
-           "crop_url"  :  "1.400.jpg",
-           "imgid"  : 1,
-           "thumb_url"  :  "1.100.jpg"
-        },
-         "imagefield"  :  "front_en",
-         "imgid"  : 1,
-         "status"  :  "status ok"
-      }
\ No newline at end of file
+{
+   "code" : "1234567890014",
+   "files" : [
+      {
+         "code" : "1234567890014",
+         "filename" : "",
+         "name" : "1234567890014",
+         "thumbnailUrl" : "/images/products/123/456/789/0014/1.100.jpg",
+         "url" : "/product/1234567890014"
+      }
+   ],
+   "image" : {
+      "crop_url" : "1.400.jpg",
+      "imgid" : 1,
+      "thumb_url" : "1.100.jpg"
+   },
+   "imagefield" : "front_en",
+   "imgid" : 1,
+   "status" : "status ok"
+}
diff --git a/tests/unit/expected_test_results/ingredients/ja-parenthesis.json b/tests/unit/expected_test_results/ingredients/ja-parenthesis.json
index 9c2556c8b2ee9..51995fc58deb8 100644
--- a/tests/unit/expected_test_results/ingredients/ja-parenthesis.json
+++ b/tests/unit/expected_test_results/ingredients/ja-parenthesis.json
@@ -4,11 +4,14 @@
          "id" : "en:soy-sauce",
          "ingredients" : [
             {
-               "id" : "ja:本醸造",
+               "ciqual_food_code" : "11104",
+               "id" : "en:honjozo",
                "percent_estimate" : 55,
                "percent_max" : 100,
                "percent_min" : 10,
-               "text" : "本醸造"
+               "text" : "本醸造",
+               "vegan" : "ignore",
+               "vegetarian" : "ignore"
             }
          ],
          "percent_estimate" : 55,
@@ -76,7 +79,7 @@
       },
       {
          "ciqual_food_code" : "26068",
-         "id" : "en:bonito-flakes",
+         "id" : "en:katsuobushi",
          "percent_estimate" : 2.8125,
          "percent_max" : 20,
          "percent_min" : 0,
@@ -99,11 +102,14 @@
          "text" : "たん白加水分解物混合物"
       },
       {
-         "id" : "ja:こんぶ",
+         "ciqual_food_code" : "20990",
+         "id" : "en:kombu",
          "percent_estimate" : 0.3515625,
          "percent_max" : 12.5,
          "percent_min" : 0,
-         "text" : "こんぶ"
+         "text" : "こんぶ",
+         "vegan" : "yes",
+         "vegetarian" : "yes"
       },
       {
          "id" : "en:condiment",
@@ -136,33 +142,27 @@
    ],
    "ingredients_analysis" : {
       "en:non-vegan" : [
-         "en:bonito-flakes"
+         "en:katsuobushi"
       ],
       "en:non-vegetarian" : [
-         "en:bonito-flakes"
+         "en:katsuobushi"
       ],
       "en:palm-oil-content-unknown" : [
-         "ja:本醸造",
          "ja:糖類",
          "ja:さば節",
          "ja:たん白加水分解物混合物",
-         "ja:こんぶ",
          "ja:アミノ酸等"
       ],
       "en:vegan-status-unknown" : [
-         "ja:本醸造",
          "ja:糖類",
          "ja:さば節",
          "ja:たん白加水分解物混合物",
-         "ja:こんぶ",
          "ja:アミノ酸等"
       ],
       "en:vegetarian-status-unknown" : [
-         "ja:本醸造",
          "ja:糖類",
          "ja:さば節",
          "ja:たん白加水分解物混合物",
-         "ja:こんぶ",
          "ja:アミノ酸等"
       ]
    },
@@ -177,17 +177,19 @@
       "ja:糖類",
       "en:mirin",
       "en:salt",
-      "en:bonito-flakes",
+      "en:katsuobushi",
       "en:fish",
       "en:tuna",
       "fr:bonite",
       "en:skipjack-tuna",
       "ja:さば節",
       "ja:たん白加水分解物混合物",
-      "ja:こんぶ",
+      "en:kombu",
+      "en:algae",
+      "en:seaweed",
       "en:condiment",
       "en:alcohol",
-      "ja:本醸造",
+      "en:honjozo",
       "en:high-fructose-corn-syrup",
       "en:added-sugar",
       "en:disaccharide",
@@ -210,13 +212,13 @@
       "ja:糖類",
       "en:mirin",
       "en:salt",
-      "en:bonito-flakes",
+      "en:katsuobushi",
       "ja:さば節",
       "ja:たん白加水分解物混合物",
-      "ja:こんぶ",
+      "en:kombu",
       "en:condiment",
       "en:alcohol",
-      "ja:本醸造",
+      "en:honjozo",
       "en:high-fructose-corn-syrup",
       "en:glucose-syrup",
       "en:sugar",
@@ -229,17 +231,19 @@
       "ja:糖類",
       "en:mirin",
       "en:salt",
-      "en:bonito-flakes",
+      "en:katsuobushi",
       "en:fish",
       "en:tuna",
       "fr:bonite",
       "en:skipjack-tuna",
       "ja:さば節",
       "ja:たん白加水分解物混合物",
-      "ja:こんぶ",
+      "en:kombu",
+      "en:algae",
+      "en:seaweed",
       "en:condiment",
       "en:alcohol",
-      "ja:本醸造",
+      "en:honjozo",
       "en:high-fructose-corn-syrup",
       "en:added-sugar",
       "en:disaccharide",
@@ -261,18 +265,16 @@
       "en:glucose-syrup",
       "en:mirin",
       "en:sugar",
-      "ja:こんぶ",
       "ja:さば節",
       "ja:たん白加水分解物混合物",
-      "ja:アミノ酸等",
-      "ja:本醸造"
+      "ja:アミノ酸等"
    ],
-   "ingredients_without_ciqual_codes_n" : 8,
-   "known_ingredients_n" : 21,
+   "ingredients_without_ciqual_codes_n" : 6,
+   "known_ingredients_n" : 25,
    "lc" : "ja",
    "nutriments" : {
       "fruits-vegetables-nuts-estimate-from-ingredients_100g" : 0,
       "fruits-vegetables-nuts-estimate-from-ingredients_serving" : 0
    },
-   "unknown_ingredients_n" : 6
+   "unknown_ingredients_n" : 4
 }
diff --git a/tests/unit/ingredients_processing.t b/tests/unit/ingredients_processing.t
index e8e0ce1500191..d7c97fae3c1e2 100755
--- a/tests/unit/ingredients_processing.t
+++ b/tests/unit/ingredients_processing.t
@@ -1746,7 +1746,7 @@ my @tests = (
 				'text' => "\x{7c89}\x{672b}\x{9152}"
 			},
 			{
-				'id' => 'en:bonito-flakes',
+				'id' => 'en:katsuobushi',
 				'processing' => 'en:powder',
 				'text' => "\x{304b}\x{3064}\x{304a}\x{7bc0}"
 			},