diff --git a/taxonomies/ingredients.txt b/taxonomies/ingredients.txt
index f49360cf0aeaf..9546342b34019 100644
--- a/taxonomies/ingredients.txt
+++ b/taxonomies/ingredients.txt
@@ -4048,6 +4048,9 @@ tr:Süt tozu
 vegan:en:no
 vegetarian:en:yes
 nova:en:3
+ciqual_proxy_food_code:en:19044
+ciqual_proxy_food_name:en:Milk, powder, semi-skimmed
+ciqual_proxy_food_name:fr:Lait en poudre, demi-écrémé
 
 <en:whole milk powder
 <en:milk from France
@@ -4459,6 +4462,8 @@ carbon_footprint_fr_foodges_ingredient:fr:Yaourt
 carbon_footprint_fr_foodges_value:fr:2.9
 vegetarian:en:yes
 vegan:en:no
+ciqual_proxy_food_code:en:19593
+ciqual_proxy_food_name:fr:Yaourt, lait fermenté ou spécialité laitière, nature
 
 <en:yogurt
 en:plain yogurt
@@ -14162,6 +14167,9 @@ wikidata:en:Q41534
 wikipedia:en:https://en.wikipedia.org/wiki/Starch
 vegan:en:yes
 vegetarian:en:yes
+ciqual_proxy_food_code:en:9510
+ciqual_proxy_food_name:en:Maize/corn starch
+ciqual_proxy_food_name:fr:Amidon de maïs ou fécule de maïs
 
 # ingredient/fr:fécules has 612 products in 5 languages @2019-01-25
 # usage:fr:fécules (dont blé)
@@ -22976,6 +22984,8 @@ wikidata:en:Q15645384
 carbon_footprint_fr_foodges_ingredient:fr:Semoule de blé dur
 carbon_footprint_fr_foodges_value:fr:0.6
 allergens:en: en:gluten
+ciqual_proxy_food_code:en:9410
+ciqual_proxy_food_name:fr:Farine de blé tendre ou froment T110
 
 <en:wheat
 en:sprouted wheat
@@ -26264,6 +26274,9 @@ vegan:en:yes
 vegetarian:en:yes
 carbon_footprint_fr_foodges_ingredient:fr:Farine de blé
 carbon_footprint_fr_foodges_value:fr:1.2
+ciqual_proxy_food_code:en:9410
+ciqual_proxy_food_name:fr:Farine de blé tendre ou froment T110
+
 
 # <en:compound
 <en:flour
@@ -30379,6 +30392,11 @@ vegan:en:yes
 vegetarian:en:yes
 # openfoodfacts:https://world.openfoodfacts.org/ingredient/glucose
 # 24682 products in 24 languages @2018-09-24
+# probably not a very good CIQUAL proxy
+ciqual_proxy_food_code:en:31016
+ciqual_proxy_food_name:en:Sugar, white
+ciqual_proxy_food_name:fr:Sucre blanc
+
 
 # nova:en:glucose-syrup
 <en:glucose
@@ -30422,9 +30440,10 @@ tr:glikoz şurubu, glukoz şurubu, glükoz şurubu
 # 32467 products in 29 languages @2018-09-24
 wikipedia:en:https://en.wikipedia.org/wiki/Glucose_syrup
 wikidata:en:Q14770547
-# probably not a very good proxy, but the closest one in Ciqual
-ciqual_proxy_food_code:31089
-ciqual_proxy_food_name:en:Syrup, agave
+# probably not a very good CIQUAL proxy
+ciqual_proxy_food_code:en:31016
+ciqual_proxy_food_name:en:Sugar, white
+ciqual_proxy_food_name:fr:Sucre blanc
 
 
 <en:glucose syrup
@@ -31112,6 +31131,9 @@ sr:dekstroza
 sv:dextros
 # openfoodfacts:https://world.openfoodfacts.org/ingredient/dextrose
 # 29818 products in 30 languages @2018-09-24
+ciqual_proxy_food_code:en:31016
+ciqual_proxy_food_name:en:Sugar, white
+ciqual_proxy_food_name:fr:Sucre blanc
 
 <en:dextrose
 en:organic dextrose
@@ -32273,6 +32295,9 @@ zh:可可粉
 # zh-hk:可可粉
 vegan:en:yes
 vegetarian:en:yes
+ciqual_proxy_food_code:en:18100
+ciqual_proxy_food_name:en:Cocoa powder, without sugar, powder, instant
+ciqual_proxy_food_name:fr:Cacao, non sucré, poudre soluble
 
 <en:cocoa
 fr:cacao cru
@@ -32484,6 +32509,9 @@ uk:Какао-порошок
 # nds-nl:Kakoupouder
 wikidata:en:Q1062396
 # ingredient/cocoa-powder has 4521 products in 23 languages @2019-05-25
+ciqual_food_code:en:18100
+ciqual_food_name:en:Cocoa powder, without sugar, powder, instant
+ciqual_food_name:fr:Cacao, non sucré, poudre soluble
 
 <en:cocoa powder
 fr:poudre de cacao cru
@@ -32492,9 +32520,6 @@ fr:poudre de cacao cru
 en:raw cacao powder, Instant cocoa powder without sugar
 de:Rohes Kakaopulver
 fr:Poudre de cacao brute, Cacao non sucré en poudre soluble
-ciqual_food_code:en:18100
-ciqual_food_name:en:Cocoa powder, without sugar, powder, instant
-ciqual_food_name:fr:Cacao, non sucré, poudre soluble
 
 <en:cocoa powder
 en:fat reduced cocoa powder, low-fat cocoa powder, low fat cocoa powder, cocoa powder with low fat content
@@ -36710,6 +36735,9 @@ carbon_footprint_fr_foodges_ingredient:fr:Abricot "Pays du Sud"
 carbon_footprint_fr_foodges_value:fr:1.1
 # 5160 in 25 @2021-09-12
 eurocode_2_group_3:en: 9.20.10
+ciqual_food_code:en:13000
+ciqual_food_name:en:Apricot, pitted, raw
+ciqual_food_name:fr:Abricot, dénoyauté, cru
 
 <en:apricot
 en:Bergeron Apricot
@@ -50021,7 +50049,9 @@ wikipedia:en:https://en.wikipedia.org/wiki/Celery
 # fr:celeri has 4877 products in 10 languages @2018-10-21
 carbon_footprint_fr_foodges_ingredient:fr:Céleri
 carbon_footprint_fr_foodges_value:fr:0.8
-eurocode_2_group_3:en: 8.20.10
+eurocode_2_group_3:en: 8.20.10	
+ciqual_proxy_food_code:en:20055
+ciqual_proxy_food_name:fr:Céleri-rave, cru
 
 <en:celery
 en:celery stalk
@@ -50032,6 +50062,7 @@ pl:seler naciowy, selera naciowego
 ciqual_food_code:en:20023
 ciqual_food_name:en:Celery stalk, raw
 ciqual_food_name:fr:Céleri branche, cru
+
 # 88 in 3 languages @2021-12-01
 
 <en:celery
diff --git a/tests/integration/expected_test_results/api_v3_product_write/patch-language-fields.json b/tests/integration/expected_test_results/api_v3_product_write/patch-language-fields.json
index 22f02735a1f80..a25c6f7007b43 100644
--- a/tests/integration/expected_test_results/api_v3_product_write/patch-language-fields.json
+++ b/tests/integration/expected_test_results/api_v3_product_write/patch-language-fields.json
@@ -24,6 +24,7 @@
             "vegetarian" : "yes"
          },
          {
+            "ciqual_food_code" : "18100",
             "id" : "en:cocoa-powder",
             "percent_estimate" : 5,
             "percent_max" : 10,
diff --git a/tests/integration/expected_test_results/search_v1/search-no-filter.json b/tests/integration/expected_test_results/search_v1/search-no-filter.json
index 9005b408da6d0..aa11763cf5b12 100644
--- a/tests/integration/expected_test_results/search_v1/search-no-filter.json
+++ b/tests/integration/expected_test_results/search_v1/search-no-filter.json
@@ -536,7 +536,7 @@
          "last_editor" : "tests",
          "last_modified_by" : "tests",
          "last_modified_t" : "--ignore--",
-      "last_updated_t" : "--ignore--",
+         "last_updated_t" : "--ignore--",
          "lc" : "en",
          "link" : "http://world.openfoodfacts.org/",
          "main_countries_tags" : [],
@@ -1318,7 +1318,7 @@
          "last_editor" : "tests",
          "last_modified_by" : "tests",
          "last_modified_t" : "--ignore--",
-      "last_updated_t" : "--ignore--",
+         "last_updated_t" : "--ignore--",
          "lc" : "en",
          "link" : "http://world.openfoodfacts.org/",
          "main_countries_tags" : [],
@@ -1990,7 +1990,7 @@
          "last_editor" : "tests",
          "last_modified_by" : "tests",
          "last_modified_t" : "--ignore--",
-      "last_updated_t" : "--ignore--",
+         "last_updated_t" : "--ignore--",
          "lc" : "en",
          "link" : "http://world.openfoodfacts.org/",
          "main_countries_tags" : [],
@@ -2762,7 +2762,7 @@
          "last_editor" : "tests",
          "last_modified_by" : "tests",
          "last_modified_t" : "--ignore--",
-      "last_updated_t" : "--ignore--",
+         "last_updated_t" : "--ignore--",
          "lc" : "es",
          "link" : "http://world.openfoodfacts.org/",
          "main_countries_tags" : [],
@@ -3674,7 +3674,7 @@
          "last_editor" : "tests",
          "last_modified_by" : "tests",
          "last_modified_t" : "--ignore--",
-      "last_updated_t" : "--ignore--",
+         "last_updated_t" : "--ignore--",
          "lc" : "es",
          "link" : "http://world.openfoodfacts.org/",
          "main_countries_tags" : [],
@@ -4612,7 +4612,7 @@
          "last_editor" : "tests",
          "last_modified_by" : "tests",
          "last_modified_t" : "--ignore--",
-      "last_updated_t" : "--ignore--",
+         "last_updated_t" : "--ignore--",
          "lc" : "en",
          "link" : "http://world.openfoodfacts.org/",
          "main_countries_tags" : [],
diff --git a/tests/integration/expected_test_results/search_v1/search-tags-categories-without-ingredients-from-palm-oil.json b/tests/integration/expected_test_results/search_v1/search-tags-categories-without-ingredients-from-palm-oil.json
index df6930d924b82..e454160d329b1 100644
--- a/tests/integration/expected_test_results/search_v1/search-tags-categories-without-ingredients-from-palm-oil.json
+++ b/tests/integration/expected_test_results/search_v1/search-tags-categories-without-ingredients-from-palm-oil.json
@@ -608,7 +608,7 @@
          "last_editor" : "tests",
          "last_modified_by" : "tests",
          "last_modified_t" : "--ignore--",
-      "last_updated_t" : "--ignore--",
+         "last_updated_t" : "--ignore--",
          "lc" : "es",
          "link" : "http://world.openfoodfacts.org/",
          "main_countries_tags" : [],
@@ -1546,7 +1546,7 @@
          "last_editor" : "tests",
          "last_modified_by" : "tests",
          "last_modified_t" : "--ignore--",
-      "last_updated_t" : "--ignore--",
+         "last_updated_t" : "--ignore--",
          "lc" : "en",
          "link" : "http://world.openfoodfacts.org/",
          "main_countries_tags" : [],
diff --git a/tests/integration/expected_test_results/search_v1/search-without-ingredients-from-palm-oil.json b/tests/integration/expected_test_results/search_v1/search-without-ingredients-from-palm-oil.json
index 9005b408da6d0..aa11763cf5b12 100644
--- a/tests/integration/expected_test_results/search_v1/search-without-ingredients-from-palm-oil.json
+++ b/tests/integration/expected_test_results/search_v1/search-without-ingredients-from-palm-oil.json
@@ -536,7 +536,7 @@
          "last_editor" : "tests",
          "last_modified_by" : "tests",
          "last_modified_t" : "--ignore--",
-      "last_updated_t" : "--ignore--",
+         "last_updated_t" : "--ignore--",
          "lc" : "en",
          "link" : "http://world.openfoodfacts.org/",
          "main_countries_tags" : [],
@@ -1318,7 +1318,7 @@
          "last_editor" : "tests",
          "last_modified_by" : "tests",
          "last_modified_t" : "--ignore--",
-      "last_updated_t" : "--ignore--",
+         "last_updated_t" : "--ignore--",
          "lc" : "en",
          "link" : "http://world.openfoodfacts.org/",
          "main_countries_tags" : [],
@@ -1990,7 +1990,7 @@
          "last_editor" : "tests",
          "last_modified_by" : "tests",
          "last_modified_t" : "--ignore--",
-      "last_updated_t" : "--ignore--",
+         "last_updated_t" : "--ignore--",
          "lc" : "en",
          "link" : "http://world.openfoodfacts.org/",
          "main_countries_tags" : [],
@@ -2762,7 +2762,7 @@
          "last_editor" : "tests",
          "last_modified_by" : "tests",
          "last_modified_t" : "--ignore--",
-      "last_updated_t" : "--ignore--",
+         "last_updated_t" : "--ignore--",
          "lc" : "es",
          "link" : "http://world.openfoodfacts.org/",
          "main_countries_tags" : [],
@@ -3674,7 +3674,7 @@
          "last_editor" : "tests",
          "last_modified_by" : "tests",
          "last_modified_t" : "--ignore--",
-      "last_updated_t" : "--ignore--",
+         "last_updated_t" : "--ignore--",
          "lc" : "es",
          "link" : "http://world.openfoodfacts.org/",
          "main_countries_tags" : [],
@@ -4612,7 +4612,7 @@
          "last_editor" : "tests",
          "last_modified_by" : "tests",
          "last_modified_t" : "--ignore--",
-      "last_updated_t" : "--ignore--",
+         "last_updated_t" : "--ignore--",
          "lc" : "en",
          "link" : "http://world.openfoodfacts.org/",
          "main_countries_tags" : [],
diff --git a/tests/unit/expected_test_results/attributes/en-maybe-vegan.json b/tests/unit/expected_test_results/attributes/en-maybe-vegan.json
index 594850a732efe..fda9eb1d02c06 100644
--- a/tests/unit/expected_test_results/attributes/en-maybe-vegan.json
+++ b/tests/unit/expected_test_results/attributes/en-maybe-vegan.json
@@ -627,6 +627,7 @@
    "food_groups_tags" : [],
    "ingredients" : [
       {
+         "ciqual_proxy_food_code" : "9510",
          "id" : "en:tapioca",
          "percent_estimate" : 66.6666666666667,
          "percent_max" : 100,
@@ -713,10 +714,9 @@
    "ingredients_with_unspecified_percent_n" : 3,
    "ingredients_with_unspecified_percent_sum" : 100,
    "ingredients_without_ciqual_codes" : [
-      "en:enzyme",
-      "en:tapioca"
+      "en:enzyme"
    ],
-   "ingredients_without_ciqual_codes_n" : 2,
+   "ingredients_without_ciqual_codes_n" : 1,
    "known_ingredients_n" : 7,
    "languages" : {},
    "languages_codes" : {},
diff --git a/tests/unit/expected_test_results/attributes/fr-palm-oil-free.json b/tests/unit/expected_test_results/attributes/fr-palm-oil-free.json
index de83f6da467cb..b533d144c6aba 100644
--- a/tests/unit/expected_test_results/attributes/fr-palm-oil-free.json
+++ b/tests/unit/expected_test_results/attributes/fr-palm-oil-free.json
@@ -630,6 +630,7 @@
          "vegetarian" : "yes"
       },
       {
+         "ciqual_proxy_food_code" : "9410",
          "id" : "en:flour",
          "percent_estimate" : 18.75,
          "percent_max" : 50,
@@ -708,10 +709,9 @@
    "ingredients_with_unspecified_percent_n" : 4,
    "ingredients_with_unspecified_percent_sum" : 100,
    "ingredients_without_ciqual_codes" : [
-      "en:chocolate",
-      "en:flour"
+      "en:chocolate"
    ],
-   "ingredients_without_ciqual_codes_n" : 2,
+   "ingredients_without_ciqual_codes_n" : 1,
    "known_ingredients_n" : 6,
    "languages" : {},
    "languages_codes" : {},
diff --git a/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-in-origins-field-multiple.json b/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-in-origins-field-multiple.json
index 6be1183c4a645..1569fbf4fa1cd 100644
--- a/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-in-origins-field-multiple.json
+++ b/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-in-origins-field-multiple.json
@@ -407,6 +407,7 @@
    ],
    "ingredients" : [
       {
+         "ciqual_food_code" : "13000",
          "id" : "en:apricot",
          "percent" : 60,
          "percent_estimate" : 60,
@@ -485,10 +486,8 @@
    "ingredients_with_specified_percent_sum" : 90,
    "ingredients_with_unspecified_percent_n" : 1,
    "ingredients_with_unspecified_percent_sum" : 10,
-   "ingredients_without_ciqual_codes" : [
-      "en:apricot"
-   ],
-   "ingredients_without_ciqual_codes_n" : 1,
+   "ingredients_without_ciqual_codes" : [],
+   "ingredients_without_ciqual_codes_n" : 0,
    "known_ingredients_n" : 10,
    "lc" : "en",
    "misc_tags" : [
diff --git a/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-in-origins-field.json b/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-in-origins-field.json
index 775fe87f291df..95d01870de79c 100644
--- a/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-in-origins-field.json
+++ b/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-in-origins-field.json
@@ -404,6 +404,7 @@
    ],
    "ingredients" : [
       {
+         "ciqual_food_code" : "13000",
          "id" : "en:apricot",
          "percent" : 60,
          "percent_estimate" : 60,
@@ -482,10 +483,8 @@
    "ingredients_with_specified_percent_sum" : 90,
    "ingredients_with_unspecified_percent_n" : 1,
    "ingredients_with_unspecified_percent_sum" : 10,
-   "ingredients_without_ciqual_codes" : [
-      "en:apricot"
-   ],
-   "ingredients_without_ciqual_codes_n" : 1,
+   "ingredients_without_ciqual_codes" : [],
+   "ingredients_without_ciqual_codes_n" : 0,
    "known_ingredients_n" : 10,
    "lc" : "en",
    "misc_tags" : [
diff --git a/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-nested-2.json b/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-nested-2.json
index ed7b10e2f725b..1ba9ed68ed637 100644
--- a/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-nested-2.json
+++ b/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-nested-2.json
@@ -413,6 +413,7 @@
          "id" : "en:chocolate",
          "ingredients" : [
             {
+               "ciqual_proxy_food_code" : "18100",
                "id" : "en:cocoa",
                "percent_estimate" : 8.33333333333333,
                "percent_max" : 50,
@@ -522,11 +523,10 @@
    "ingredients_with_unspecified_percent_sum" : 100,
    "ingredients_without_ciqual_codes" : [
       "en:chocolate",
-      "en:cocoa",
       "en:e951",
       "en:sweetener"
    ],
-   "ingredients_without_ciqual_codes_n" : 4,
+   "ingredients_without_ciqual_codes_n" : 3,
    "known_ingredients_n" : 9,
    "lc" : "en",
    "misc_tags" : [
diff --git a/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-not-specified.json b/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-not-specified.json
index 5a4e26c660e40..dab076bb06910 100644
--- a/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-not-specified.json
+++ b/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-not-specified.json
@@ -400,6 +400,7 @@
    ],
    "ingredients" : [
       {
+         "ciqual_food_code" : "13000",
          "id" : "en:apricot",
          "percent" : 60,
          "percent_estimate" : 60,
@@ -477,10 +478,8 @@
    "ingredients_with_specified_percent_sum" : 90,
    "ingredients_with_unspecified_percent_n" : 1,
    "ingredients_with_unspecified_percent_sum" : 10,
-   "ingredients_without_ciqual_codes" : [
-      "en:apricot"
-   ],
-   "ingredients_without_ciqual_codes_n" : 1,
+   "ingredients_without_ciqual_codes" : [],
+   "ingredients_without_ciqual_codes_n" : 0,
    "known_ingredients_n" : 10,
    "lc" : "en",
    "misc_tags" : [
diff --git a/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-partly-specified.json b/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-partly-specified.json
index 7983de1292c8b..69ea84c5f55ed 100644
--- a/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-partly-specified.json
+++ b/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-partly-specified.json
@@ -402,6 +402,7 @@
    ],
    "ingredients" : [
       {
+         "ciqual_food_code" : "13000",
          "id" : "en:apricot",
          "origins" : "en:france",
          "percent" : 60,
@@ -480,10 +481,8 @@
    "ingredients_with_specified_percent_sum" : 90,
    "ingredients_with_unspecified_percent_n" : 1,
    "ingredients_with_unspecified_percent_sum" : 10,
-   "ingredients_without_ciqual_codes" : [
-      "en:apricot"
-   ],
-   "ingredients_without_ciqual_codes_n" : 1,
+   "ingredients_without_ciqual_codes" : [],
+   "ingredients_without_ciqual_codes_n" : 0,
    "known_ingredients_n" : 10,
    "lc" : "en",
    "misc_tags" : [
diff --git a/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-specified-multiple.json b/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-specified-multiple.json
index e23f312b333a0..88cffc11f1b7b 100644
--- a/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-specified-multiple.json
+++ b/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-specified-multiple.json
@@ -418,6 +418,7 @@
    ],
    "ingredients" : [
       {
+         "ciqual_food_code" : "13000",
          "id" : "en:apricot",
          "origins" : "en:france,en:spain",
          "percent" : 60,
@@ -497,10 +498,8 @@
    "ingredients_with_specified_percent_sum" : 90,
    "ingredients_with_unspecified_percent_n" : 1,
    "ingredients_with_unspecified_percent_sum" : 10,
-   "ingredients_without_ciqual_codes" : [
-      "en:apricot"
-   ],
-   "ingredients_without_ciqual_codes_n" : 1,
+   "ingredients_without_ciqual_codes" : [],
+   "ingredients_without_ciqual_codes_n" : 0,
    "known_ingredients_n" : 10,
    "lc" : "en",
    "misc_tags" : [
diff --git a/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-specified.json b/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-specified.json
index 44babfc577886..adcce5544051b 100644
--- a/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-specified.json
+++ b/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-specified.json
@@ -408,6 +408,7 @@
    ],
    "ingredients" : [
       {
+         "ciqual_food_code" : "13000",
          "id" : "en:apricot",
          "origins" : "en:france",
          "percent" : 60,
@@ -488,10 +489,8 @@
    "ingredients_with_specified_percent_sum" : 90,
    "ingredients_with_unspecified_percent_n" : 1,
    "ingredients_with_unspecified_percent_sum" : 10,
-   "ingredients_without_ciqual_codes" : [
-      "en:apricot"
-   ],
-   "ingredients_without_ciqual_codes_n" : 1,
+   "ingredients_without_ciqual_codes" : [],
+   "ingredients_without_ciqual_codes_n" : 0,
    "known_ingredients_n" : 10,
    "lc" : "en",
    "misc_tags" : [
diff --git a/tests/unit/expected_test_results/ecoscore/packaging-fr-new-shapes.json b/tests/unit/expected_test_results/ecoscore/packaging-fr-new-shapes.json
index 7b075a8dffbe9..9e49f1cc82ddd 100644
--- a/tests/unit/expected_test_results/ecoscore/packaging-fr-new-shapes.json
+++ b/tests/unit/expected_test_results/ecoscore/packaging-fr-new-shapes.json
@@ -438,6 +438,7 @@
    ],
    "ingredients" : [
       {
+         "ciqual_proxy_food_code" : "9410",
          "id" : "en:wheat",
          "origins" : "en:france",
          "percent_estimate" : 100,
@@ -476,10 +477,8 @@
    "ingredients_with_specified_percent_sum" : 0,
    "ingredients_with_unspecified_percent_n" : 1,
    "ingredients_with_unspecified_percent_sum" : 100,
-   "ingredients_without_ciqual_codes" : [
-      "en:wheat"
-   ],
-   "ingredients_without_ciqual_codes_n" : 1,
+   "ingredients_without_ciqual_codes" : [],
+   "ingredients_without_ciqual_codes_n" : 0,
    "known_ingredients_n" : 2,
    "lc" : "fr",
    "misc_tags" : [
diff --git a/tests/unit/expected_test_results/ecoscore/packaging-unspecified-no-a-eco-score.json b/tests/unit/expected_test_results/ecoscore/packaging-unspecified-no-a-eco-score.json
index 9dceaed226322..c153dd7811778 100644
--- a/tests/unit/expected_test_results/ecoscore/packaging-unspecified-no-a-eco-score.json
+++ b/tests/unit/expected_test_results/ecoscore/packaging-unspecified-no-a-eco-score.json
@@ -400,6 +400,7 @@
    ],
    "ingredients" : [
       {
+         "ciqual_proxy_food_code" : "9410",
          "id" : "en:wheat",
          "origins" : "en:france",
          "percent_estimate" : 100,
@@ -438,10 +439,8 @@
    "ingredients_with_specified_percent_sum" : 0,
    "ingredients_with_unspecified_percent_n" : 1,
    "ingredients_with_unspecified_percent_sum" : 100,
-   "ingredients_without_ciqual_codes" : [
-      "en:wheat"
-   ],
-   "ingredients_without_ciqual_codes_n" : 1,
+   "ingredients_without_ciqual_codes" : [],
+   "ingredients_without_ciqual_codes_n" : 0,
    "known_ingredients_n" : 2,
    "labels_tags" : [
       "fr:ab-agriculture-biologique"
diff --git a/tests/unit/expected_test_results/ingredients/en-allergens-in-parenthesis.json b/tests/unit/expected_test_results/ingredients/en-allergens-in-parenthesis.json
index 958ba702c3e9e..323176adc1884 100644
--- a/tests/unit/expected_test_results/ingredients/en-allergens-in-parenthesis.json
+++ b/tests/unit/expected_test_results/ingredients/en-allergens-in-parenthesis.json
@@ -35,6 +35,7 @@
          "id" : "en:dough",
          "ingredients" : [
             {
+               "ciqual_proxy_food_code" : "9410",
                "id" : "en:flour",
                "percent_estimate" : 4.6875,
                "percent_max" : 25,
@@ -152,10 +153,9 @@
    "ingredients_with_unspecified_percent_sum" : 100,
    "ingredients_without_ciqual_codes" : [
       "en:dough",
-      "en:flour",
       "en:gluten"
    ],
-   "ingredients_without_ciqual_codes_n" : 3,
+   "ingredients_without_ciqual_codes_n" : 2,
    "known_ingredients_n" : 13,
    "lc" : "en",
    "nutriments" : {
diff --git a/tests/unit/expected_test_results/ingredients/fi-additives-percents.json b/tests/unit/expected_test_results/ingredients/fi-additives-percents.json
index bb6107c2fbcf1..8d2949303fc1f 100644
--- a/tests/unit/expected_test_results/ingredients/fi-additives-percents.json
+++ b/tests/unit/expected_test_results/ingredients/fi-additives-percents.json
@@ -1,6 +1,7 @@
 {
    "ingredients" : [
       {
+         "ciqual_proxy_food_code" : "9410",
          "id" : "en:flour",
          "percent" : 12,
          "percent_estimate" : 12,
@@ -267,10 +268,9 @@
       "en:e474",
       "en:e475",
       "en:emulsifier",
-      "en:flour",
       "en:milk-proteins"
    ],
-   "ingredients_without_ciqual_codes_n" : 15,
+   "ingredients_without_ciqual_codes_n" : 14,
    "known_ingredients_n" : 26,
    "lc" : "fi",
    "misc_tags" : [
diff --git a/tests/unit/expected_test_results/ingredients/fi-origins.json b/tests/unit/expected_test_results/ingredients/fi-origins.json
index 1f9235c11182c..924465c45b7b3 100644
--- a/tests/unit/expected_test_results/ingredients/fi-origins.json
+++ b/tests/unit/expected_test_results/ingredients/fi-origins.json
@@ -45,6 +45,7 @@
          "vegetarian" : "yes"
       },
       {
+         "ciqual_proxy_food_code" : "18100",
          "id" : "en:cocoa",
          "labels" : "en:fair-trade",
          "percent_estimate" : 2.60416666666666,
@@ -115,10 +116,8 @@
    "ingredients_with_specified_percent_sum" : 0,
    "ingredients_with_unspecified_percent_n" : 6,
    "ingredients_with_unspecified_percent_sum" : 100,
-   "ingredients_without_ciqual_codes" : [
-      "en:cocoa"
-   ],
-   "ingredients_without_ciqual_codes_n" : 1,
+   "ingredients_without_ciqual_codes" : [],
+   "ingredients_without_ciqual_codes_n" : 0,
    "known_ingredients_n" : 10,
    "lc" : "fi",
    "nutriments" : {
diff --git a/tests/unit/expected_test_results/ingredients/fr-cacao-issu-de-l-agriculture-biologique-de-madagascar.json b/tests/unit/expected_test_results/ingredients/fr-cacao-issu-de-l-agriculture-biologique-de-madagascar.json
index b26f44f793dcc..723b9ec13def5 100644
--- a/tests/unit/expected_test_results/ingredients/fr-cacao-issu-de-l-agriculture-biologique-de-madagascar.json
+++ b/tests/unit/expected_test_results/ingredients/fr-cacao-issu-de-l-agriculture-biologique-de-madagascar.json
@@ -1,6 +1,7 @@
 {
    "ingredients" : [
       {
+         "ciqual_proxy_food_code" : "18100",
          "id" : "en:cocoa",
          "labels" : "en:organic",
          "origins" : "en:madagascar",
@@ -40,10 +41,8 @@
    "ingredients_with_specified_percent_sum" : 0,
    "ingredients_with_unspecified_percent_n" : 1,
    "ingredients_with_unspecified_percent_sum" : 100,
-   "ingredients_without_ciqual_codes" : [
-      "en:cocoa"
-   ],
-   "ingredients_without_ciqual_codes_n" : 1,
+   "ingredients_without_ciqual_codes" : [],
+   "ingredients_without_ciqual_codes_n" : 0,
    "known_ingredients_n" : 2,
    "lc" : "fr",
    "nutriments" : {
diff --git a/tests/unit/expected_test_results/ingredients/fr-chocolate-cake.json b/tests/unit/expected_test_results/ingredients/fr-chocolate-cake.json
index fd75c3bcdcff8..36599550e2a8b 100644
--- a/tests/unit/expected_test_results/ingredients/fr-chocolate-cake.json
+++ b/tests/unit/expected_test_results/ingredients/fr-chocolate-cake.json
@@ -1,6 +1,7 @@
 {
    "ingredients" : [
       {
+         "ciqual_proxy_food_code" : "9410",
          "id" : "en:flour",
          "percent" : 12,
          "percent_estimate" : 12,
@@ -265,10 +266,9 @@
       "en:e474",
       "en:e475",
       "en:emulsifier",
-      "en:flour",
       "en:milk-proteins"
    ],
-   "ingredients_without_ciqual_codes_n" : 15,
+   "ingredients_without_ciqual_codes_n" : 14,
    "known_ingredients_n" : 25,
    "lc" : "fr",
    "misc_tags" : [
diff --git a/tests/unit/expected_test_results/ingredients/fr-farines-labels-and-processes.json b/tests/unit/expected_test_results/ingredients/fr-farines-labels-and-processes.json
index a5ae4c39fc291..4ba691a916058 100644
--- a/tests/unit/expected_test_results/ingredients/fr-farines-labels-and-processes.json
+++ b/tests/unit/expected_test_results/ingredients/fr-farines-labels-and-processes.json
@@ -23,6 +23,7 @@
          "vegetarian" : "yes"
       },
       {
+         "ciqual_proxy_food_code" : "9410",
          "id" : "en:flour",
          "labels" : "en:no-gluten",
          "percent_estimate" : 9.375,
@@ -33,6 +34,7 @@
          "vegetarian" : "yes"
       },
       {
+         "ciqual_proxy_food_code" : "9410",
          "id" : "en:einkorn-wheat",
          "percent_estimate" : 9.375,
          "percent_max" : 25,
@@ -84,11 +86,8 @@
    "ingredients_with_specified_percent_sum" : 0,
    "ingredients_with_unspecified_percent_n" : 4,
    "ingredients_with_unspecified_percent_sum" : 100,
-   "ingredients_without_ciqual_codes" : [
-      "en:einkorn-wheat",
-      "en:flour"
-   ],
-   "ingredients_without_ciqual_codes_n" : 2,
+   "ingredients_without_ciqual_codes" : [],
+   "ingredients_without_ciqual_codes_n" : 0,
    "known_ingredients_n" : 7,
    "lc" : "fr",
    "nutriments" : {
diff --git a/tests/unit/expected_test_results/ingredients/fr-origins-labels.json b/tests/unit/expected_test_results/ingredients/fr-origins-labels.json
index 608f87eb9c9db..21f37110c0a68 100644
--- a/tests/unit/expected_test_results/ingredients/fr-origins-labels.json
+++ b/tests/unit/expected_test_results/ingredients/fr-origins-labels.json
@@ -66,6 +66,7 @@
          "vegetarian" : "yes"
       },
       {
+         "ciqual_proxy_food_code" : "18100",
          "id" : "en:cocoa",
          "labels" : "en:fair-trade",
          "percent_estimate" : 0.694444444444443,
@@ -159,10 +160,9 @@
    "ingredients_with_unspecified_percent_n" : 9,
    "ingredients_with_unspecified_percent_sum" : 100,
    "ingredients_without_ciqual_codes" : [
-      "en:cocoa",
       "en:grapefruit"
    ],
-   "ingredients_without_ciqual_codes_n" : 2,
+   "ingredients_without_ciqual_codes_n" : 1,
    "known_ingredients_n" : 14,
    "lc" : "fr",
    "nutriments" : {
diff --git a/tests/unit/expected_test_results/ingredients/fr-specific-ingredients.json b/tests/unit/expected_test_results/ingredients/fr-specific-ingredients.json
index 3fc8025564720..4c9ed632edc6a 100644
--- a/tests/unit/expected_test_results/ingredients/fr-specific-ingredients.json
+++ b/tests/unit/expected_test_results/ingredients/fr-specific-ingredients.json
@@ -12,6 +12,7 @@
          "vegetarian" : "yes"
       },
       {
+         "ciqual_food_code" : "13000",
          "id" : "en:apricot",
          "labels" : "en:organic",
          "origins" : "en:provence",
@@ -109,11 +110,10 @@
    "ingredients_with_unspecified_percent_n" : 4,
    "ingredients_with_unspecified_percent_sum" : 100,
    "ingredients_without_ciqual_codes" : [
-      "en:apricot",
       "en:fruit-pectin",
       "en:gelling-agent"
    ],
-   "ingredients_without_ciqual_codes_n" : 3,
+   "ingredients_without_ciqual_codes_n" : 2,
    "known_ingredients_n" : 14,
    "lc" : "fr",
    "nutriments" : {
diff --git a/tests/unit/expected_test_results/ingredients/ja-additives.json b/tests/unit/expected_test_results/ingredients/ja-additives.json
index 8735bdc645a2f..f0141f328ad7a 100644
--- a/tests/unit/expected_test_results/ingredients/ja-additives.json
+++ b/tests/unit/expected_test_results/ingredients/ja-additives.json
@@ -4,6 +4,7 @@
          "id" : "en:thickener",
          "ingredients" : [
             {
+               "ciqual_proxy_food_code" : "9510",
                "id" : "en:modified-starch",
                "percent_estimate" : 31.25,
                "percent_max" : 100,
@@ -47,6 +48,7 @@
          "vegetarian" : "yes"
       },
       {
+         "ciqual_proxy_food_code" : "9510",
          "id" : "en:modified-starch",
          "percent_estimate" : 5.46875,
          "percent_max" : 25,
@@ -214,13 +216,12 @@
       "en:e262",
       "en:e415",
       "en:e640i",
-      "en:modified-starch",
       "en:thickener",
       "en:vegetable-pigment",
       "en:vitamin-c",
       "en:vitamin-e"
    ],
-   "ingredients_without_ciqual_codes_n" : 12,
+   "ingredients_without_ciqual_codes_n" : 11,
    "known_ingredients_n" : 18,
    "lc" : "ja",
    "nutriments" : {
diff --git a/tests/unit/expected_test_results/ingredients/ja-origins.json b/tests/unit/expected_test_results/ingredients/ja-origins.json
index c82f9494cdf8d..8dbf17b5faa9f 100644
--- a/tests/unit/expected_test_results/ingredients/ja-origins.json
+++ b/tests/unit/expected_test_results/ingredients/ja-origins.json
@@ -77,6 +77,7 @@
          "vegetarian" : "yes"
       },
       {
+         "ciqual_proxy_food_code" : "18100",
          "id" : "en:cocoa",
          "origins" : "en:outside-japan,en:japan",
          "percent_estimate" : 0.35511363636364,
@@ -225,11 +226,10 @@
    "ingredients_with_unspecified_percent_sum" : 100,
    "ingredients_without_ciqual_codes" : [
       "en:breadfruit",
-      "en:cocoa",
       "en:malt",
       "en:meat"
    ],
-   "ingredients_without_ciqual_codes_n" : 4,
+   "ingredients_without_ciqual_codes_n" : 3,
    "known_ingredients_n" : 31,
    "lc" : "ja",
    "nutriments" : {
diff --git a/tests/unit/expected_test_results/ingredients/ja-parenthesis.json b/tests/unit/expected_test_results/ingredients/ja-parenthesis.json
index 271acc7dc3999..1f28f0a1a50e0 100644
--- a/tests/unit/expected_test_results/ingredients/ja-parenthesis.json
+++ b/tests/unit/expected_test_results/ingredients/ja-parenthesis.json
@@ -37,6 +37,7 @@
                "vegetarian" : "yes"
             },
             {
+               "ciqual_proxy_food_code" : "31016",
                "id" : "en:glucose-syrup",
                "percent_estimate" : 5.625,
                "percent_max" : 25,
@@ -261,12 +262,11 @@
    "ingredients_without_ciqual_codes" : [
       "en:amino-acids",
       "en:condiment",
-      "en:glucose-syrup",
       "en:mirin",
       "ja:さば節",
       "ja:たん白加水分解物混合物"
    ],
-   "ingredients_without_ciqual_codes_n" : 6,
+   "ingredients_without_ciqual_codes_n" : 5,
    "known_ingredients_n" : 26,
    "lc" : "ja",
    "nutriments" : {
diff --git a/tests/unit/expected_test_results/ingredients/ja-slash.json b/tests/unit/expected_test_results/ingredients/ja-slash.json
index 22c9ef6080601..d5bab039801e4 100644
--- a/tests/unit/expected_test_results/ingredients/ja-slash.json
+++ b/tests/unit/expected_test_results/ingredients/ja-slash.json
@@ -109,6 +109,7 @@
          "text" : "小麦胚芽"
       },
       {
+         "ciqual_proxy_food_code" : "9510",
          "id" : "en:modified-starch",
          "percent_estimate" : 0.0227864583333286,
          "percent_max" : 8.33333333333333,
@@ -253,12 +254,11 @@
       "en:emulsifier",
       "en:fat",
       "en:flavouring",
-      "en:modified-starch",
       "en:raising-agent",
       "en:vegetable-oil-and-fat",
       "ja:小麦胚芽"
    ],
-   "ingredients_without_ciqual_codes_n" : 7,
+   "ingredients_without_ciqual_codes_n" : 6,
    "known_ingredients_n" : 27,
    "lc" : "ja",
    "nutriments" : {