add conditions for matching fields (useful for Ferrero where each nutrient is on one line) + other small changes
add conditions for matching fields (useful for Ferrero where each nutrient is on one line) + other small changes

openfoodfacts/openfoodfacts-server,openfoodfacts/openfoodfacts-server,openfoodfacts/openfoodfacts-server,openfoodfacts/openfoodfacts-server,openfoodfacts/openfoodfacts-server