diff --git a/taxonomies/food/categories.txt b/taxonomies/food/categories.txt
index 80fbb2beb2557..ddad653a14fd7 100644
--- a/taxonomies/food/categories.txt
+++ b/taxonomies/food/categories.txt
@@ -33259,7 +33259,6 @@ ciqual_food_name:en: Potato flakes, dehydrated, with milk or cream
 ciqual_food_name:fr: Pomme de terre, flocons déshydratés, au lait ou à la crème
 
 < en:Mashed potatoes
-< en:Sweet potatoes
 en: Sweet potato puree cooked with cream
 fr: Purée de patates douces cuisinée à la crème, Purée de patate douce cuisinée à la crème
 agribalyse_food_code:en: 4103
@@ -63446,6 +63445,18 @@ hr: Pšenični škrob
 lt: Kviečių krakmolas
 nl: Tarwezetmelen
 
+< en:Starches
+en: Tapioca
+fr: Tapioca, Tapioca cru, Perles du Japon crues, Perles du Japon
+hr: Tapioka
+ja: タピオカ
+pt: Tapioca
+agribalyse_food_code:en: 4000
+ciqual_food_code:en: 4000
+ciqual_food_name:en: Tapioca, raw
+ciqual_food_name:fr: Tapioca ou Perles du Japon, cru
+
+
 < en:Cereals and their products
 en: Groats
 de: Graupen
@@ -79161,6 +79172,10 @@ fr: Soupes de crevettes
 < en:Soups
 nl: Erwtensoepen
 
+< en:Soups
+en: Sweet potato soups
+nl: Zoete aardappelsoepen
+
 < en:Reheatable soups
 < en:Soups
 fr: Soupes de fruits de mer
@@ -81104,6 +81119,10 @@ ciqual_food_name:fr: Légume cuit (aliment moyen)
 < en:Prepared vegetables
 en: Prepared carrots
 
+< en:Prepared vegetables
+en: Prepared sweet potatoes
+nl: Geprepareerde zoete aardappelen
+
 < en:Carrots
 en: Grated carrots
 de: Geriebene Karotten, geraspelte Karotten
@@ -93403,14 +93422,15 @@ nl: Tortellinis
 pl: Uszka, Tortellini
 wikidata:en: Q20057
 
-< en:Tortellini
-en: Tortellini ricotta & spinach
-fr: Tortellini ricotta & épinards
-hr: Tortellini ricotta & špinat
-it: Tortellini ricotta e spinaci
-agribalyse_proxy_food_code:en: 25219
-agribalyse_proxy_food_name:en: Lasagna or cannelloni with vegetables and goat cheese, cooked
-agribalyse_proxy_food_name:fr: Lasagnes ou canelloni aux légumes et au fromage de chèvre, cuits
+#< en:Tortellini
+#en: Tortellini ricotta & spinach
+#fr: Tortellini ricotta & épinards
+#hr: Tortellini ricotta & špinat
+#it: Tortellini ricotta e spinaci
+#agribalyse_proxy_food_code:en: 25219
+#agribalyse_proxy_food_name:en: Lasagna or cannelloni with vegetables and goat cheese, cooked
+#agribalyse_proxy_food_name:fr: Lasagnes ou canelloni aux légumes et au fromage de chèvre, cuits
+# no products 8 sep 2024
 
 < en:Pasta stuffed with cheese
 < en:Tortellini
@@ -101160,6 +101180,11 @@ ciqual_food_name:en: Jam, cherry
 ciqual_food_name:fr: Confiture de cerise (extra ou classique)
 wikidata:en: Q47472139
 
+< en:Jams
+en: Rhubarb-strawberry jams
+fr: Confitures de fraise et de rhubarbe
+nl: Rabarber-aardbeien jams
+
 < en:Jams
 en: Figs jams
 bg: Конфитюр от смокини
@@ -102257,59 +102282,6 @@ hr: Vegetarijanske paštete od tofua
 nl: Plantaardige pastas op basis van tofu
 pl: Pasztety roślinne z tofu
 
-< en:Plant-based foods
-en: Pumpkin and Squash plant products, Pumpkin plant products, Squash plant products
-de: Kürbisprodukte, Produkte aus Kürbisgewächsen
-es: Productos de la planta de la calabaza
-fi: kurpitsatuotteet
-fr: Produits de la plante de courge
-hr: Biljni proizvodi od bundeve i tikve
-it: Prodotti di zucca
-la: Cucurbita
-nl: Pompoenproducten
-wikidata:en: Q5339301
-
-< en:Pumpkin and Squash plant products
-en: Pumpkin pulp
-fr: Pulpe de citrouille
-agribalyse_food_code:en: 20166
-ciqual_food_code:en: 20166
-ciqual_food_name:en: Pumpkin, pulp, raw
-ciqual_food_name:fr: Citrouille, pulpe, crue
-
-< en:Pumpkin and Squash plant products
-en: Squash pulp, Cucurbita moschata pulp
-fr: Courge musquée, Pulpe de courge musquée
-agribalyse_food_code:en: 20128
-ciqual_food_code:en: 20128
-ciqual_food_name:en: Pumpkin (cucurbita moschata), pulp, raw
-ciqual_food_name:fr: Courge musquée, pulpe, crue
-
-< en:Pumpkin and Squash plant products
-en: Red kuri squash
-es: Cucurbita maxima
-fr: Potimarron
-agribalyse_proxy_food_code:en: 20132
-ciqual_proxy_food_code:en: 20132
-ciqual_proxy_food_name:en: Red kuri squash, pulp, raw
-ciqual_proxy_food_name:fr: Potimarron, pulpe, cru
-
-< en:Red kuri squash
-en: Red kuri pulp
-fr: Pulpe de potimarron
-agribalyse_food_code:en: 20132
-ciqual_food_code:en: 20132
-ciqual_food_name:en: Red kuri squash, pulp, raw
-ciqual_food_name:fr: Potimarron, pulpe, cru
-
-< en:Pumpkin and Squash plant products
-en: Sweet green hokkaido squash, Sweet green hokkaido pulp
-fr: Pulpe de courge hokkaïdo
-agribalyse_food_code:en: 20134
-ciqual_food_code:en: 20134
-ciqual_food_name:en: Sweet green hokkaido squash, pulp, raw
-ciqual_food_name:fr: Courge hokkaïdo, pulpe, crue
-
 < en:Pumpkin and Squash plant products
 en: Pumpkin seeds and their products, Squash seeds and their products
 bg: Тиквени семки и продукти от тях
@@ -102322,35 +102294,17 @@ it: Semi di zucca e derivati
 nl: Pompoenzaden en afgeleiden
 pl: Pestki dyni i ich produkty
 
-< en:Pumpkin and Squash plant products
-en: Squash
-fr: Courge
-hr: Skvoš
-ja: スクワッシュ
-agribalyse_food_code:en: 20139
-ciqual_food_code:en: 20139
-ciqual_food_name:en: Squash, all types, raw
-ciqual_food_name:fr: Courge, crue
-
-< en:Squash
-en: Fresh squash
-fr: Courges fraîches, Courge fraîche
-
-< en:Pumpkin and Squash plant products
-en: Cooked spaghetti squash pulp
-fr: Pulpe de courge spaghetti cuite
-agribalyse_food_code:en: 20143
-ciqual_food_code:en: 20143
-ciqual_food_name:en: Squash, spaghetti, pulp, cooked
-ciqual_food_name:fr: Courge spaghetti, pulpe, cuite
-
-< en:Pumpkin and Squash plant products
-en: Spaghetti squash pulp
-fr: Pulpe de courge spaghetti
-agribalyse_food_code:en: 20145
-ciqual_food_code:en: 20145
-ciqual_food_name:en: Squash, spaghetti, pulp, raw
-ciqual_food_name:fr: Courge spaghetti, pulpe, crue
+< en:Plant-based foods
+en: Pumpkin and Squash plant products, Pumpkin plant products, Squash plant products
+de: Kürbisprodukte, Produkte aus Kürbisgewächsen
+es: Productos de la planta de la calabaza
+fi: kurpitsatuotteet
+fr: Produits de la plante de courge
+hr: Biljni proizvodi od bundeve i tikve
+it: Prodotti di zucca
+la: Cucurbita
+nl: Pompoenproducten
+wikidata:en: Q5339301
 
 < en:Cucurbitacea seeds
 < en:Pumpkin seeds and their products
@@ -103454,6 +103408,14 @@ food_groups:en: en:vegetables
 pnns_group_2:en: Vegetables
 wikidata:en: Q11004
 
+< en:Vegetables based foods
+en: Leeks fondue, Slow-simmered leeks
+fr: Fondue de poireau
+agribalyse_food_code:en: 20135
+ciqual_food_code:en: 20135
+ciqual_food_name:en: Leeks fondue or slow-simmered leeks
+ciqual_food_name:fr: Fondue de poireau
+
 < en:Vegetables based foods
 en: Vegetables
 de: Gemüse
@@ -103475,7 +103437,7 @@ wikidata:en: Q20136
 
 < en:Vegetables
 en: Vegetables from Germany, German vegetables
-fr: Fruits allemands
+fr: Légumes allemands
 hr: Povrće iz Njemačke
 lt: Vokiškos daržovės
 
@@ -103832,21 +103794,6 @@ ciqual_food_code:en: 20081
 ciqual_food_name:en: Salsify, canned, drained
 ciqual_food_name:fr: Salsifis, appertisé, égoutté
 
-< en:Canned vegetables
-< en:Spinachs
-en: Canned spinachs
-bg: Консервиран спанак
-de: Spinat in Dosen, Dosenspinat
-es: Espinacas en conserva
-fi: purkitetut pinaatit
-fr: Épinards en conserve, Épinards appertisés
-hr: Špinat iz konzerve
-it: Spinaci in scatola
-nl: Spinazie in blik/pot
-agribalyse_food_code:en: 20060
-ciqual_food_code:en: 20060
-ciqual_food_name:en: Spinach, canned, drained
-ciqual_food_name:fr: Épinard, appertisé, égoutté
 
 < en:Canned vegetables
 < en:Tomatoes
@@ -105745,6 +105692,7 @@ pl: Czosnek
 agribalyse_proxy_food_code:en: 11000
 agribalyse_proxy_food_name:en: Garlic, fresh
 agribalyse_proxy_food_name:fr: Ail, cru
+expected_ingredients:en: en:garlic
 gpc_category_code:en: 10006003
 gpc_category_description:en: Definition: Includes any product that can be described/observed as a fresh commercial variety of Garlic of varieties (cultivars) grown from Allium sativum L. to be supplied fresh to the consumer. Definition Excludes: Specifically excludes: Prepared/Processed or Unprepared/Unprocessed and Shelf Stable or Frozen Garlic.
 gpc_category_name:en: Garlic
@@ -105752,6 +105700,7 @@ wikidata:en: Q23400
 
 < en:Garlic
 it: Aglio di Voghiera
+xx: Aglio di Voghiera
 origins:en: en:italy
 protected_name_file_number:en: PDO-IT-0638
 protected_name_type:en: pdo
@@ -105759,12 +105708,13 @@ protected_name_type:en: pdo
 
 < en:Garlic
 it: Aglio Bianco Polesano
+xx: Aglio Bianco Polesano
 origins:en: en:italy
 protected_name_file_number:en: PDO-IT-0566
 protected_name_type:en: pdo
 #wikidata:en:
 
-< en:Garlic
+< en: Garlic and their products
 fr: Ail doux au piment
 
 < en:Fresh vegetables
@@ -105774,6 +105724,7 @@ bg: Пресен чесън
 de: Frischer Knoblauch
 fr: Ail frais, Ail cru
 hr: Svježi češnjak
+nl: Verse knoflook
 agribalyse_food_code:en: 11000
 ciqual_food_code:en: 11000
 ciqual_food_name:en: Garlic, fresh
@@ -105784,7 +105735,8 @@ season_in_country_fr:en: 7,8,9,10,11,12
 en: Allium neapolitanum
 de: Neapolitanischer Lauch
 fr: Ail Blanc
-hr: Napolitanski luk (alium neapolitanum).
+hr: Napolitanski luk
+nl: Witte knoflook
 wikidata:en: Q1817792
 
 < en:Garlic
@@ -105792,9 +105744,11 @@ en: Purple garlic
 ca: All morat
 es: Ajo morado
 hr: Ljubičasti češnjak
+nl: Paarse knoflook
 
 < en:Allium neapolitanum
 fr: Ail blanc de Lomagne
+xx: Ail blanc de Lomagne
 origins:en: en:lomagne
 protected_name_file_number:en: PGI-FR-0470
 protected_name_type:en: pgi
@@ -105802,6 +105756,7 @@ protected_name_type:en: pgi
 < en:French vegetables
 < en:Garlic
 fr: Ail rose de Lautrec
+xx: Ail rose de Lautrec
 origins:en: en:lautrec
 protected_name_file_number:en: PGI-FR-0193
 protected_name_type:en: pgi
@@ -105809,6 +105764,7 @@ protected_name_type:en: pgi
 < en:French vegetables
 < en:Garlic
 fr: Ail de la Drôme
+xx: Ail de la Drôme
 origins:en: en:drome
 protected_name_file_number:en: PGI-FR-0537
 protected_name_type:en: pgi
@@ -105816,6 +105772,7 @@ protected_name_type:en: pgi
 < en:French vegetables
 < en:Garlic
 fr: Ail fumé d'Arleux
+xx: Ail fumé d'Arleux
 origins:en: en:arleux
 protected_name_file_number:en: PGI-FR-0820
 protected_name_type:en: pgi
@@ -105823,6 +105780,7 @@ protected_name_type:en: pgi
 < en:French vegetables
 < en:Garlic
 fr: Ail violet de Cadours
+xx: Ail violet de Cadours
 origins:en: en:france
 protected_name_file_number:en: PDO-FR-02103-AM01, PDO-FR-02103
 protected_name_type:en: pdo
@@ -105834,7 +105792,7 @@ es: Ajos tiernos, Brotes de ajo
 fr: Aillets
 hr: Zeleni češnjak
 hu: Zöld foghagyma
-
+nl: Groene knoflook
 
 < en:Vegetable rods
 # <en:ingredient:en:vegetable
@@ -105916,6 +105874,7 @@ ciqual_food_code:en: 20039
 ciqual_food_name:en: Leek, raw
 ciqual_food_name:fr: Poireau, cru
 description:en: The leek is a vegetable, a cultivar of Allium ampeloprasum, the broadleaf wild leek. Leeks have a mild, onion-like taste. In its raw state, the vegetable is crunchy and firm. The edible portions of the leek are the white base of the leaves (above the roots and stem base), the light green parts, and to a lesser extent the dark green parts of the leaves. Leeks are typically chopped into slices 5–10 mm thick. The slices have a tendency to fall apart, due to the layered structure of the leek. The different ways of preparing the vegetable are: boiling, frying or raw.
+expected_ingredients:en: en:leek
 intake24_category_code:en: LEEK
 # aeb-arab:كرّاث
 # frr:Gäärslook
@@ -105948,6 +105907,7 @@ en: Fresh leeks
 es: Puerro fresco
 fr: Poireaux frais
 hr: Svježi poriluk
+nl: Verse prei
 season_in_country_fr:en: 1,2,3,4,9,10,11,12
 
 < en:Leeks
@@ -105957,14 +105917,6 @@ protected_name_file_number:en: PGI-FR-0198
 protected_name_type:en: pgi
 #wikidata:en:
 
-< en:Leeks
-en: Leeks fondue, Slow-simmered leeks
-fr: Fondue de poireau
-agribalyse_food_code:en: 20135
-ciqual_food_code:en: 20135
-ciqual_food_name:en: Leeks fondue or slow-simmered leeks
-ciqual_food_name:fr: Fondue de poireau
-
 < en:Leaf vegetables
 en: Lettuces, lettuce
 af: Blaarslaai
@@ -106179,6 +106131,7 @@ ciqual_food_code:en: 20034
 ciqual_food_name:en: Onion, raw
 ciqual_food_name:fr: Oignon, cru
 description:en: The onion (Allium cepa L.), also known as the bulb onion or common onion, is a vegetable that is the most widely cultivated species of the genus Allium. They are usually served cooked, as a vegetable or part of a prepared savoury dish, but can also be eaten raw or used to make pickles or chutneys.
+expected_ingredients:en: en:onion
 intake24_category_code:en: ONIO
 # aeb-arab:راس بصل
 # ckb:پیاز
@@ -106217,9 +106170,15 @@ fi: Keltasipulit, keltasipuli, keltainen sipuli
 fr: Oignons jaunes, oignon jaune
 hr: Žuti luk
 nl: Gele uien
+expected_ingredients:en: en:yellow onion
 wikidata:en: Q8051898
 wikipedia:en: https://en.wikipedia.org/wiki/Yellow_onion
 
+< en: Yellow onions
+en: Fresh yellow onions
+nl: Verse gele uien
+expected_ingredients:en: en:yellow onion
+
 < en:Onions
 en: White onions, white onion
 bg: Бял лук
@@ -106227,6 +106186,7 @@ de: Weiße Zwiebeln
 fr: Oignons blancs, oignon blanc
 hr: Bijeli luk
 nl: Witte uien
+expected_ingredients:en: en:white onion
 wikidata:en: Q7995660
 wikipedia:en: https://en.wikipedia.org/wiki/White_onion
 
@@ -106236,6 +106196,7 @@ en: Fresh white onions
 fr: Oignons blancs frais
 hr: Svježi bijeli luk
 nl: Verse witte uien
+expected_ingredients:en: en:white onion
 
 < en:Onions
 en: Red onions, red onion, purple onions, Bombay onions
@@ -106246,6 +106207,7 @@ fr: Oignons rouges, oignon rouge
 hr: Crveni luk
 ja: 赤たまねぎ, 紫たまねぎ
 nl: Rode uien
+expected_ingredients:en: en:red onion
 wikidata:en: Q622350
 wikipedia:en: https://en.wikipedia.org/wiki/Red_onion
 
@@ -106255,6 +106217,7 @@ en: Fresh red onions
 fr: Oignons rouges frais
 hr: Svježi crveni luk
 nl: Verse rode uien
+expected_ingredients:en: en:red onion
 
 < en:Cooked vegetables
 < en:Onions
@@ -106281,6 +106244,7 @@ agribalyse_food_code:en: 20097
 ciqual_food_code:en: 20097
 ciqual_food_name:en: Shallot, raw
 ciqual_food_name:fr: Échalote, crue
+expected_ingredients:en: en:shallots
 wikidata:en: Q193498
 
 < en:Fresh vegetables
@@ -106289,6 +106253,7 @@ en: Fresh shallots
 fr: Échalotes fraîches
 hr: Svježa ljutika
 nl: Verse sjalotjes
+expected_ingredients:en: en:shallots
 season_in_country_fr:en: 10,11,12
 
 < en:Cooked vegetables
@@ -106306,6 +106271,7 @@ ciqual_food_name:fr: Échalote, cuite
 < en:Shallots
 fr: Echalote d'Anjou
 nl: Sjalotten uit Anjou
+expected_ingredients:en: en:shallots
 origins:en: en:france
 protected_name_file_number:en: PGI-FR-01253
 protected_name_type:en: pgi
@@ -106326,6 +106292,7 @@ agribalyse_food_code:en: 20041
 ciqual_food_code:en: 20041
 ciqual_food_name:en: Sweet pepper, green, yellow or red, raw
 ciqual_food_name:fr: Poivron, vert, jaune ou rouge, cru
+expected_ingredients:en: en:sweet pepper
 intake24_category_code:en: PPRS
 intake24_category_code:fr: PPRS
 
@@ -106336,6 +106303,7 @@ bg: Пресни чушки
 fr: Poivrons frais
 hr: Svježe slatke paprike
 nl: Verse paprikas
+expected_ingredients:en: en:sweet pepper
 season_in_country_fr:en: 6,7,8,9
 
 < en:Cooked vegetables
@@ -106385,6 +106353,9 @@ ciqual_food_code:en: 20168
 ciqual_food_name:en: Sweet pepper, yellow, raw
 ciqual_food_name:fr: Poivron jaune, cru
 
+< en: Yellow sweet peppers
+en: Fresh yellow sweet peppers
+nl: Verse gele paprikas
 
 < en:Cooked peppers
 < en:Red sweet peppers
@@ -106803,11 +106774,82 @@ wikidata:en: Q2929377
 fr: Pommes de terre catégorie 1, Pommes de terre Cat. 1
 
 
+< en:Pumpkin and Squash plant products
+en: Squash
+fr: Courge
+hr: Skvoš
+ja: スクワッシュ
+agribalyse_food_code:en: 20139
+ciqual_food_code:en: 20139
+ciqual_food_name:en: Squash, all types, raw
+ciqual_food_name:fr: Courge, crue
+expected_ingredients:en: en:squash
 
+< en:Pumpkin and Squash plant products
+en: Squash pulp, Cucurbita moschata pulp
+fr: Pulpe de courge musquée, Courge musquée
+agribalyse_food_code:en: 20128
+ciqual_food_code:en: 20128
+ciqual_food_name:en: Pumpkin (cucurbita moschata), pulp, raw
+ciqual_food_name:fr: Courge musquée, pulpe, crue
 
+< en:Pumpkin and Squash plant products
+en: Pumpkin pulp
+fr: Pulpe de citrouille
+agribalyse_food_code:en: 20166
+ciqual_food_code:en: 20166
+ciqual_food_name:en: Pumpkin, pulp, raw
+ciqual_food_name:fr: Citrouille, pulpe, crue
 
-< en:Pumpkins and their products
-en: Pumpkins, Squashes
+< en:Squash pulp
+en: Red kuri squash
+es: Cucurbita maxima
+fr: Potimarron
+agribalyse_proxy_food_code:en: 20132
+ciqual_proxy_food_code:en: 20132
+ciqual_proxy_food_name:en: Red kuri squash, pulp, raw
+ciqual_proxy_food_name:fr: Potimarron, pulpe, cru
+
+< en:Red kuri squash
+en: Red kuri pulp, Red kuri squash pulp
+fr: Pulpe de potimarron
+agribalyse_food_code:en: 20132
+ciqual_food_code:en: 20132
+ciqual_food_name:en: Red kuri squash, pulp, raw
+ciqual_food_name:fr: Potimarron, pulpe, cru
+
+< en:Squash pulp
+en: Sweet green hokkaido pulp, Sweet green hokkaido squash
+fr: Pulpe de courge hokkaïdo
+agribalyse_food_code:en: 20134
+ciqual_food_code:en: 20134
+ciqual_food_name:en: Sweet green hokkaido squash, pulp, raw
+ciqual_food_name:fr: Courge hokkaïdo, pulpe, crue
+
+< en:Squash pulp
+en: Cooked spaghetti squash pulp
+fr: Pulpe de courge spaghetti cuite
+agribalyse_food_code:en: 20143
+ciqual_food_code:en: 20143
+ciqual_food_name:en: Squash, spaghetti, pulp, cooked
+ciqual_food_name:fr: Courge spaghetti, pulpe, cuite
+
+< en:Squash pulp
+en: Spaghetti squash pulp
+fr: Pulpe de courge spaghetti
+agribalyse_food_code:en: 20145
+ciqual_food_code:en: 20145
+ciqual_food_name:en: Squash, spaghetti, pulp, raw
+ciqual_food_name:fr: Courge spaghetti, pulpe, crue
+
+< en:Squash
+en: Fresh squash
+fr: Courges fraîches, Courge fraîche
+nl: Verse pompenen
+expected_ingredients:en: en:squash
+
+< en:Squash
+en: Pumpkins, Winter squashs
 bg: Тиква
 de: Kürbisse
 es: Calabazas
@@ -106821,10 +106863,8 @@ agribalyse_food_code:en: 20044
 ciqual_food_code:en: 20044
 ciqual_food_name:en: Pumpkin, raw
 ciqual_food_name:fr: Potiron, cru
-
-< en:Pumpkins
-fr: Potiron frais
-season_in_country_fr:en: 1,9,10,11,12
+comment:en: A pumpkin is a cultivated winter squash in the genus Cucurbita.
+expected_ingredients:en: en:pumpkin
 
 < en:Pumpkins
 en: Pulp of melonnette jaspée from Vendée, Squash of melonnette jaspée from Vendée
@@ -106836,7 +106876,7 @@ ciqual_food_name:fr: Courge melonnette, pulpe, crue
 
 < en:Pumpkins
 en: Pattypan squash
-de: Patissons
+xx: Patissons
 fr: Pâtissons, Patissons
 hr: Pattypan squash
 agribalyse_proxy_food_code:en: 20136
@@ -106863,7 +106903,11 @@ ciqual_food_name:fr: Potiron, appertisé, égoutté
 < en:Fresh vegetables
 < en:Pumpkins
 en: Fresh pumpkins
-fr: Citrouilles fraîches, citrouille fraîche
+fr: Courges fraîches Citrouilles fraîches, citrouille fraîche
+season_in_country_fr:en: 1,9,10,11,12
+
+< en:Fresh pumpkins
+fr: Potiron frais
 season_in_country_fr:en: 1,9,10,11,12
 
 < en:Pumpkins
@@ -106885,9 +106929,17 @@ es: Calabazas espagueti, Calabazas spaghetti
 fr: Courges spaghetti, courge spaghetti
 hr: Špageti tikve
 nl: Spaghettipompoenen
+expected_ingredients:en: en:spaghetti squash
 wikidata:en: Q2142043
 
-# <en:vegetable
+< en: Spaghetti squashes
+en: Fresh spaghetti squashes
+fr: Courges spaghetti fraîches
+comment:en: Usually these are sold as units, sometimes one can buy parts (by weight).
+expected_ingredients:en: en:spaghetti squash
+
+##############################
+
 < en:Vegetables
 en: Radishes, radish
 am: ፍጁል
@@ -107017,6 +107069,8 @@ wikipedia:en: https://en.wikipedia.org/wiki/Radish
 < en:Radishes
 en: Fresh radishes
 fr: Radis frais
+nl: Verse radijs
+expected_ingredients:en: en:radish
 season_in_country_fr:en: 3,4,5,6
 
 
@@ -107033,11 +107087,14 @@ agribalyse_food_code:en: 20045
 ciqual_food_code:en: 20045
 ciqual_food_name:en: Radish, raw
 ciqual_food_name:fr: Radis rouge, cru
+expected_ingredients:en: en:res radish
 wikidata:en: Q1057750
 
 < en:Red radishes
 en: Fresh red radishes
 fr: Radis roses frais, Radis rose frais
+nl: Verse rode radijs
+expected_ingredients:en: en:red radish
 
 < en:Radishes
 en: Black radishes, Black radish
@@ -107049,11 +107106,14 @@ agribalyse_food_code:en: 20089
 ciqual_food_code:en: 20089
 ciqual_food_name:en: Radish, black, raw
 ciqual_food_name:fr: Radis noir, cru
+expected_ingredients:en: en:black radish
 wikidata:en: Q159587
 
 < en:Black radishes
 en: Fresh black radishes, Fresh black radish
 fr: Radis noirs frais, Radis noir frais
+nl: Verse zwarte radijs
+expected_ingredients:en: en:black radish
 
 < en:Radishes
 en: Daikon radishes, Daikon, White radishes
@@ -107062,6 +107122,8 @@ fr: Radis blancs, radis blanc
 hr: Daikon rotkvice
 ja: ダイコン, 大根, だいこん
 la: Raphanus sativus var. longipinnatus
+nl: Daikon radijs
+expected_ingredients:en: en:daikon radish
 wikidata:en: Q7224757
 # Not sure what to do with ja: translation, 「ダイコン」 seems to have a complex relationship with "radish".
 
@@ -107071,16 +107133,24 @@ en: Fresh red cabbage
 es: Lombarda fresca
 fr: Choux rouges frais
 hr: Svježi crveni kupus
+expected_ingredients:en: en:taro
 
 < en:Vegetables
 en: Taro tubers
 fr: Tubercules de taro
+nl: Taro
+
+< en:Fresh vegetables
+< en:Taro tubers
+en: Fresh taro tubers
+fr: Tubercules de taro fraiches
 hr: Taro gomolji
 ja: タロイモ
 agribalyse_food_code:en: 53200
 ciqual_food_code:en: 53200
 ciqual_food_name:en: Taro, tuber, raw
 ciqual_food_name:fr: Taro, tubercule, cru
+expected_ingredients:en: en:taro
 
 < en:Cooked vegetables
 < en:Taro tubers
@@ -107110,9 +107180,8 @@ ciqual_food_code:en: 54034
 ciqual_food_name:en: Cassava or manioc, roots, cooked
 ciqual_food_name:fr: Manioc, racine cuite
 
-# <en:vegetable
 < en:Vegetable rods
-en: Rhubarbs, Rhubarb
+en: Rhubarb, Rhubarbs, Rhubarb stalk
 bg: Ревен
 cs: rebarbora
 da: Rabarber
@@ -107120,11 +107189,11 @@ de: Rhabarber
 es: Ruibarbos, Ruibarbo
 et: rabarber
 fi: raparperi
-fr: Rhubarbes, Rhubarbe
+fr: Rhubarbes, Rhubarbe, Tiges de rhubarbe
 ga: Biabhóg
-hr: Rabarbare, Rabarbara
+hr: Rabarbare, Rabarbara, Stabljika rabarbare
 it: rabarbaro
-ja: ルバーブ, ショクヨウダイオウ, 食用大黄
+ja: ルバーブ, ショクヨウダイオウ, 食用大黄, ルバーブの葉柄
 la: Rheum
 lt: Rabarbaras, Rabarbarai
 lv: rabarber
@@ -107141,39 +107210,40 @@ agribalyse_proxy_food_name:fr: Rhubarbe, tige, crue
 description:en: Rhubarb is a cultivated plant in the genus Rheum in the family Polygonaceae. Rhubarb is stewed with sugar or used in pies and desserts, but it can also be put into savoury dishes or pickled. Rhubarb can be dehydrated and infused with fruit juice.
 # ingredient/fr:rhubarbe has 191 products in 4 languages @2019-05-08
 # category/rhubarbs has 4 products 22019-05-22
+expected_ingredients:en: en:rhubarb
+sales_format:en: package, weight
 season_in_country_fr:en: 4,5,6
 wikidata:en: Q20767168
 # plant:wikidata:en:Q7535
 wikipedia:en: https://en.wikipedia.org/wiki/Rhubarb
 
-< en:Fresh fruits
-< en:Rhubarbs
-en: Fresh rhubarbs
+< en:Rhubarb
+en: Fresh rhubarb, fresh rhubarbs
 fr: Rhubarbes fraîches
 hr: Svježe rabarbare
 nl: Verse rabarber
-
-< en:Vegetable rods
-en: Rhubarb stalk
-fr: Tiges de rhubarbe
-hr: Stabljika rabarbare
-ja: ルバーブの葉柄
 agribalyse_food_code:en: 13047
 ciqual_food_code:en: 13047
 ciqual_food_name:en: Rhubarb, stalk, raw
 ciqual_food_name:fr: Rhubarbe, tige, crue
+expected_ingredients:en: en:rhubarb
+
+#< en:Rhubarb
+#en: Rhubarb stalk cooked with sugar
+#fr: Tiges de rhubarbe cuites sucrées
+#agribalyse_food_code:en: 13048
+#ciqual_food_code:en: 13048
+#ciqual_food_name:en: Rhubarb, stalk, cooked, with sugar
+#ciqual_food_name:fr: Rhubarbe, tige, cuite, sucrée
+# expected_ingredients:en: en:rhubarb, en:sugar
+# no products at 5 sep 2024
 
-< en:Rhubarb stalk
-en: Rhubarb stalk cooked with sugar
-fr: Tiges de rhubarbe cuites sucrées
-agribalyse_food_code:en: 13048
-ciqual_food_code:en: 13048
-ciqual_food_name:en: Rhubarb, stalk, cooked, with sugar
-ciqual_food_name:fr: Rhubarbe, tige, cuite, sucrée
-
-< en:Rhubarb stalk
+< en:Frozen vegetables
+< en:Rhubarb
 en: Frozen rhubarb stalk
 fr: Tiges de rhubarbe surgelées
+nl: Diepvriesrabarber
+expected_ingredients:en: en:rhubarb
 
 < en:Leaf vegetables
 en: Romanesco, Romanesco broccoli, Romanesque cauliflower, romanesco cauliflower
@@ -107282,34 +107352,25 @@ nl: Spinazie
 pl: Szpinak
 ru: Шпинат
 tr: Ispanak
-agribalyse_food_code:en: 20059
-ciqual_food_code:en: 20059
-ciqual_food_name:en: Spinach, raw
-ciqual_food_name:fr: Épinard, cru
+agribalyse_proxy_food_code:en: 20059
+ciqual_proxy_food_code:en: 20059
+ciqual_proxy_food_name:en: Spinach, raw
+ciqual_proxy_food_name:fr: Épinard, cru
 intake24_category_code:en: SPNC
 intake24_category_code:fr: SPNC
 wikidata:en: Q81464
 
-< en:Prepared vegetables
-en: Spinach with cream sauce
-fr: Épinards à la crème
-hr: Špinat s umakom od vrhnja
-nl: Spinazies met room
-agribalyse_food_code:en: 25026
-ciqual_food_code:en: 25026
-ciqual_food_name:en: Spinach w cream sauce
-ciqual_food_name:fr: Épinards à la crème
-
-< en:Cooked vegetables
-< en:Spinachs
-en: Cooked spinach
-fr: Épinards cuits
-hr: Kuhani špinat
-pl: Szpinak gotowany
-agribalyse_food_code:en: 20027
-ciqual_food_code:en: 20027
-ciqual_food_name:en: Spinach, cooked
-ciqual_food_name:fr: Épinard, cuit
+#< en:Cooked vegetables
+#< en:Spinachs
+#en: Cooked spinach
+#fr: Épinards cuits
+#hr: Kuhani špinat
+#pl: Szpinak gotowany
+#agribalyse_food_code:en: 20027
+#ciqual_food_code:en: 20027
+#ciqual_food_name:en: Spinach, cooked
+#ciqual_food_name:fr: Épinard, cuit
+# no products on 7 sep 2024
 
 < en:Fresh vegetables
 < en:Spinachs
@@ -107322,19 +107383,102 @@ fr: Épinards frais
 hr: Svježi špinat
 nl: Verse spinazies
 pl: Szpinak świeży
+agribalyse_food_code:en: 20059
+ciqual_food_code:en: 20059
+ciqual_food_name:en: Spinach, raw
+ciqual_food_name:fr: Épinard, cru
+expected_ingredients:en: en:spinach
+opposite:en: en:frozen-spinachs
+sales_format:en: package, weight
 season_in_country_fr:en: 1,2,3,4,5,9,10,11,12
 
 < en:Spinachs
-en: Spinach young leaves
+en: Young spinach leaves, Spinach young leaves
 fr: Jeunes pousses d'épinards pour salades
 agribalyse_food_code:en: 20270
 ciqual_food_code:en: 20270
 ciqual_food_name:en: Spinach, young leaves, raw
 ciqual_food_name:fr: Épinard, jeunes pousses pour salades, cru
+expected_ingredients:en: en:spinach
+
+< en:Canned vegetables
+< en:Spinachs
+en: Canned spinachs
+bg: Консервиран спанак
+de: Spinat in Dosen, Dosenspinat
+es: Espinacas en conserva
+fi: purkitetut pinaatit
+fr: Épinards en conserve, Épinards appertisés
+hr: Špinat iz konzerve
+it: Spinaci in scatola
+nl: Spinazie in blik/pot
+agribalyse_food_code:en: 20060
+ciqual_food_code:en: 20060
+ciqual_food_name:en: Spinach, canned, drained
+ciqual_food_name:fr: Épinard, appertisé, égoutté
+
+< en:Frozen vegetables
+< en:Spinachs
+en: Frozen spinachs, Frozen spinach
+bg: Замразен спанак
+de: Gefrorene Spinate
+es: Espinacas congeladas
+fi: pakastetut pinaatit
+fr: Épinards surgelés
+hr: Smrznuti špinat
+it: Spinaci surgelati
+nl: Diepvriesspinazies
+pl: Szpinak mrożony
+agribalyse_food_code:en: 20083
+ciqual_food_code:en: 20083
+ciqual_food_name:en: Spinach, frozen, raw
+ciqual_food_name:fr: Épinard, surgelé, cru
+opposite:en: en:fresh-spinachs
+
+< en:Frozen spinachs
+en: Frozen chopped spinachs
+de: Gefrorene gehackte Spinate
+es: Espinacas troceadas congeladas, Espinacas congeladas troceadas
+fr: Épinards hachés surgelés
+hr: Smrznuti nasjeckani špinat
+nl: Diepvries gehakte spinazies
+opposite:en: en:frozen-spinach-leaves
+
+< en:Frozen spinachs
+en: Frozen spinach leaves
+bg: Замразен спанак на листа
+de: Gefrorene Spinatblätter
+es: Espinacas en hojas congeladas, Espinacas congeladas en hojas
+fr: Feuilles d'épinard congelées
+hr: Smrznuto lišće špinata
+nl: Diepvries bladspinazies
+opposite:en: en:frozen-chopped-spinachs
+
+#< en:Frozen spinachs
+#en: Frozen cooked spinach
+#fr: Épinards surgelés cuits
+#agribalyse_food_code:en: 20121
+#ciqual_food_code:en: 20121
+#ciqual_food_name:en: Spinach, frozen, cooked
+#ciqual_food_name:fr: Épinard, surgelé, cuit
+# no products on 7 sep 2024
+
+< en:Prepared vegetables
+en: Prepared spinachs
+
+< en:Prepared spinachs
+en: Spinach with cream sauce
+fr: Épinards à la crème
+hr: Špinat s umakom od vrhnja
+nl: Spinazies met room
+agribalyse_food_code:en: 25026
+ciqual_food_code:en: 25026
+ciqual_food_name:en: Spinach w cream sauce
+ciqual_food_name:fr: Épinards à la crème
 
 < en:Cereals and potatoes
-< en:Fresh vegetables
-en: Sweet potatoes
+< en:Root vegetables
+en: Sweet potatoes, Sweet potato
 bg: Сладки картофи
 de: Süßkartoffeln
 es: Batatas, Boniatos
@@ -107346,26 +107490,56 @@ ja: サツマイモ, さつまいも, 薩摩芋
 la: Ipomoea batatas
 nl: Zoete aardappelen
 pl: Bataty, Słodkie ziemniaki, Ziemniaki słodkie
+agribalyse_proxy_food_code:en: 4101
+agribalyse_proxy_food_name:en: Sweet potato, raw
+agribalyse_proxy_food_name:fr: Patate douce, crue
+comment:en: The category Sweet Potatoes contains products that contain a single ingredient (Sweet Potatoes) and that have undergone minimal processing: unprocessed raw fresh potatoes, cleaned raw sweet potatoes, frozen cleaned raw sweet potatoes and cooked sweet potatoes. Products that have added ingredients should be put under en:Prepared sweet potatoes.
+expected_ingredients:en: en:sweet-potatoes
+food_groups:en: en:potatoes
+pnns_group_2:en: Potatoes
+sales_format:en: package, weight
+wikidata:en: Q37937
+
+< en:Fresh vegetables
+< en:Sweet potatoes
+en: Peeled sweet potatoes
+nl: Zoete aardappelen (schoongemaakt)
+agribalyse_proxy_food_code:en: 4101
+agribalyse_proxy_food_name:en: Sweet potato, raw
+agribalyse_proxy_food_name:fr: Patate douce, crue
+expected_ingredients:en: en:sweet-potatoes
+wikidata:en: Q37937
+
+< en:Fresh vegetables
+< en:Sweet potatoes
+en: Fresh sweet potatoes
+nl: Zoete aardappelen (vers)
 agribalyse_food_code:en: 4101
 ciqual_food_code:en: 4101
 ciqual_food_name:en: Sweet potato, raw
 ciqual_food_name:fr: Patate douce, crue
-food_groups:en: en:potatoes
-pnns_group_2:en: Potatoes
-wikidata:en: Q37937
+expected_ingredients:en: en:sweet-potatoes
+sales_format:en: package, weight
 
 < en:Cooked vegetables
 < en:Sweet potatoes
 en: Cooked sweet potatoes
 fr: Patates douces cuites
+nl: Zoete aardappelen (gekookt)
 agribalyse_food_code:en: 4102
 ciqual_food_code:en: 4102
 ciqual_food_name:en: Sweet potato, cooked
 ciqual_food_name:fr: Patate douce, cuite
+expected_ingredients:en: en:sweet-potatoes
 
 < en:Sweet potatoes
 en: Frozen sweet potatoes
 fr: Patates douces surgelées
+nl: Zoete aardappelen (diepvries)
+agribalyse_proxy_food_code:en: 4101
+agribalyse_proxy_food_name:en: Sweet potato, raw
+agribalyse_proxy_food_name:fr: Patate douce, crue
+expected_ingredients:en: en:sweet-potatoes
 
 < en:Vegetables
 en: Turnip, turnips
@@ -112424,48 +112598,6 @@ fr: Chou romanesco surgelé
 hr: Smrznuti romanesco
 nl: Diepvries Romanescos
 
-< en:Frozen vegetables
-< en:Spinachs
-en: Frozen spinachs, Frozen spinach
-bg: Замразен спанак
-de: Gefrorene Spinate
-es: Espinacas congeladas
-fi: pakastetut pinaatit
-fr: Épinards surgelés
-hr: Smrznuti špinat
-it: Spinaci surgelati
-nl: Diepvriesspinazies
-pl: Szpinak mrożony
-agribalyse_food_code:en: 20083
-ciqual_food_code:en: 20083
-ciqual_food_name:en: Spinach, frozen, raw
-ciqual_food_name:fr: Épinard, surgelé, cru
-
-< en:Frozen spinachs
-en: Frozen chopped spinachs
-de: Gefrorene gehackte Spinate
-es: Espinacas troceadas congeladas, Espinacas congeladas troceadas
-fr: Épinards hachés surgelés
-hr: Smrznuti nasjeckani špinat
-nl: Diepvries gehakte spinazies
-
-< en:Frozen spinachs
-en: Frozen spinach leaves
-bg: Замразен спанак на листа
-de: Gefrorene Spinatblätter
-es: Espinacas en hojas congeladas, Espinacas congeladas en hojas
-fr: Feuilles d'épinard congelées
-hr: Smrznuto lišće špinata
-nl: Diepvries bladspinazies
-
-< en:Frozen spinachs
-en: Frozen cooked spinach
-fr: Épinards surgelés cuits
-agribalyse_food_code:en: 20121
-ciqual_food_code:en: 20121
-ciqual_food_name:en: Spinach, frozen, cooked
-ciqual_food_name:fr: Épinard, surgelé, cuit
-
 < en:Frozen vegetables
 < en:Zucchini
 en: Frozen zucchini, Frozen courgettes
diff --git a/taxonomies/food/ingredients.txt b/taxonomies/food/ingredients.txt
index 894f59c3e0a9b..9f3eb5958266c 100644
--- a/taxonomies/food/ingredients.txt
+++ b/taxonomies/food/ingredients.txt
@@ -50256,13 +50256,6 @@ hr: mladi špinat
 nl: Baby spinazie
 sv: babyspenat
 
-< en:spinach
-en: spinach leaves
-bg: спанак на листа
-fr: feuille d'épinards
-hr: lišće špinata
-nl: spinazieblad
-
 < en:spinach
 en: spinach powder
 #en:processing:en:powder
@@ -50293,10 +50286,13 @@ ciqual_food_name:en: Spinach, cooked
 ciqual_food_name:fr: Épinard, cuit
 
 < en:spinach
-fr: épinards en branches, épinards branches
+en: spinach leaves
+bg: спанак на листа
 de: Blattspinat
+fr: épinards en branches, épinards branches, feuille d'épinards
+hr: lišće špinata
 it: foglie di spinaci
-nl: bladspinazie
+nl: bladspinazie, spinazieblad
 # fr:épinards-en-branches in 3 languages 44 products @2018-10-14
 
 < en:spinach
diff --git a/tests/integration/expected_test_results/api_cgi_suggest/categories-string-strawberry.json b/tests/integration/expected_test_results/api_cgi_suggest/categories-string-strawberry.json
index a56e72dc24c0b..b65ed4eb99a71 100644
--- a/tests/integration/expected_test_results/api_cgi_suggest/categories-string-strawberry.json
+++ b/tests/integration/expected_test_results/api_cgi_suggest/categories-string-strawberry.json
@@ -22,5 +22,6 @@
    "Strawberry yogurt drinks",
    "Strawberry yogurts",
    "Strawberry-Vanilla ice cream cones",
-   "Partially skimmed strawberry flavoured milk with sugar fortified with vitamins D"
+   "Partially skimmed strawberry flavoured milk with sugar fortified with vitamins D",
+   "Rhubarb-strawberry jams"
 ]
diff --git a/tests/integration/expected_test_results/api_cgi_suggest/categories-term-fr-fraise.json b/tests/integration/expected_test_results/api_cgi_suggest/categories-term-fr-fraise.json
index 8637bded5fb74..14d57edd45b4e 100644
--- a/tests/integration/expected_test_results/api_cgi_suggest/categories-term-fr-fraise.json
+++ b/tests/integration/expected_test_results/api_cgi_suggest/categories-term-fr-fraise.json
@@ -19,9 +19,9 @@
    "Compotes fraise groseille",
    "Compotes fraise myrtille",
    "Compotes pommes fraise",
+   "Confitures de fraise et de rhubarbe",
    "Confitures de fraises",
    "Coulis de fraise",
    "Crêpes fourrées aux fraises",
-   "Cônes vanille fraise",
-   "Glaces à la fraise"
+   "Cônes vanille fraise"
 ]
diff --git a/tests/integration/expected_test_results/api_cgi_suggest/categories-term-strawberry.json b/tests/integration/expected_test_results/api_cgi_suggest/categories-term-strawberry.json
index a56e72dc24c0b..b65ed4eb99a71 100644
--- a/tests/integration/expected_test_results/api_cgi_suggest/categories-term-strawberry.json
+++ b/tests/integration/expected_test_results/api_cgi_suggest/categories-term-strawberry.json
@@ -22,5 +22,6 @@
    "Strawberry yogurt drinks",
    "Strawberry yogurts",
    "Strawberry-Vanilla ice cream cones",
-   "Partially skimmed strawberry flavoured milk with sugar fortified with vitamins D"
+   "Partially skimmed strawberry flavoured milk with sugar fortified with vitamins D",
+   "Rhubarb-strawberry jams"
 ]
diff --git a/tests/integration/expected_test_results/api_v3_taxonomy_suggestions/categories-string-fr-fraise.json b/tests/integration/expected_test_results/api_v3_taxonomy_suggestions/categories-string-fr-fraise.json
index cb37e6a175647..317c77a39b8e2 100644
--- a/tests/integration/expected_test_results/api_v3_taxonomy_suggestions/categories-string-fr-fraise.json
+++ b/tests/integration/expected_test_results/api_v3_taxonomy_suggestions/categories-string-fr-fraise.json
@@ -22,11 +22,11 @@
       "Compotes fraise groseille",
       "Compotes fraise myrtille",
       "Compotes pommes fraise",
+      "Confitures de fraise et de rhubarbe",
       "Confitures de fraises",
       "Coulis de fraise",
       "Crêpes fourrées aux fraises",
-      "Cônes vanille fraise",
-      "Glaces à la fraise"
+      "Cônes vanille fraise"
    ],
    "warnings" : []
 }
diff --git a/tests/integration/expected_test_results/api_v3_taxonomy_suggestions/categories-string-strawberry.json b/tests/integration/expected_test_results/api_v3_taxonomy_suggestions/categories-string-strawberry.json
index 6364a344431b7..96ccaf0bd92ef 100644
--- a/tests/integration/expected_test_results/api_v3_taxonomy_suggestions/categories-string-strawberry.json
+++ b/tests/integration/expected_test_results/api_v3_taxonomy_suggestions/categories-string-strawberry.json
@@ -25,7 +25,8 @@
       "Strawberry yogurt drinks",
       "Strawberry yogurts",
       "Strawberry-Vanilla ice cream cones",
-      "Partially skimmed strawberry flavoured milk with sugar fortified with vitamins D"
+      "Partially skimmed strawberry flavoured milk with sugar fortified with vitamins D",
+      "Rhubarb-strawberry jams"
    ],
    "warnings" : []
 }
diff --git a/tests/integration/expected_test_results/api_v3_taxonomy_suggestions/categories-term-strawberry.json b/tests/integration/expected_test_results/api_v3_taxonomy_suggestions/categories-term-strawberry.json
index 6364a344431b7..96ccaf0bd92ef 100644
--- a/tests/integration/expected_test_results/api_v3_taxonomy_suggestions/categories-term-strawberry.json
+++ b/tests/integration/expected_test_results/api_v3_taxonomy_suggestions/categories-term-strawberry.json
@@ -25,7 +25,8 @@
       "Strawberry yogurt drinks",
       "Strawberry yogurts",
       "Strawberry-Vanilla ice cream cones",
-      "Partially skimmed strawberry flavoured milk with sugar fortified with vitamins D"
+      "Partially skimmed strawberry flavoured milk with sugar fortified with vitamins D",
+      "Rhubarb-strawberry jams"
    ],
    "warnings" : []
 }