diff --git a/classes/postHandler.php b/classes/postHandler.php
index 022f193..5ad7da7 100644
--- a/classes/postHandler.php
+++ b/classes/postHandler.php
@@ -84,27 +84,13 @@ class PostHandler
         foreach ($articles as $article) {
             $article["type"] = $this->dao->get_categories_of_article($article["id"]);
             //EXPERIMENTAL
-            $response = $this->get_openfoodfacts_product('3057640385148');
-            if($response["status"] == 1){
-                $product = $response["product"];
-                $article["image_"] = $product["image_front_url"] != "" ? $product["image_front_url"] : $this->imageBaseUrl . $article["id"] . ".jpg";;
-                $article["nutri_score"] = $product["nutrition_grade_fr"];
-                $article["ingredients_fr"] = $product["ingredients_text_fr"] != "" ? $product["ingredients_text_fr"] : $product["ingredients_text"];
-                $article["ingredients_en"] = $product["ingredients_text_en"] != "" ? $product["ingredients_text_en"] : $product["ingredients_text"];
-                $article["name_fr"] = $product["product_name_fr"] != "" ? $product["product_name_fr"] : $product["product_name"];
-                $article["name_en"] = $product["product_name_en"] != "" ? $product["product_name_en"] : $product["product_name"];
-                $article["description_fr"] = $product["generic_name_fr"] != "" ? $product["generic_name_fr"] : $product["generic_name"];
-                $article["description_en"] = $product["generic_name_en"] != "" ? $product["generic_name_en"] : $product["generic_name"];
-            } else {
-                $article["image"] = $this->imageBaseUrl . $article["id"] . ".jpg";
-                $article["nutri_score"] = "";
-                $article["ingredients_fr"] = "";
-                $article["ingredients_en"] = "";
-                $article["name_fr"] = "";
-                $article["name_en"] = "";
-                $article["description_fr"] = "";
-                $article["description_en"] = "";
-            }
+            $response = $this->get_openfoodfacts_product($article["code"]);
+            $product = $response["product"];
+            $article["image"] = $product["image_front_url"] != "" ? $product["image_front_url"] : $this->imageBaseUrl . $article["id"] . ".jpg";
+            $article["nutri-score"] = !empty($product["nutrition_grade_fr"])  ? $product["nutrition_grade_fr"]  : null;
+            $article["ingredients"] = !empty($product["ingredients_text_fr"]) ? $product["ingredients_text_fr"] : !empty($product["ingredients_text"]) ? $product["ingredients_text"] : null;
+            $article["name"]        = !empty($product["product_name_fr"])     ? $product["product_name_fr"]     : !empty($product["product_name"])     ? $product["product_name"]     : $article["name"];
+            $article["description"] = !empty($product["generic_name_fr"])     ? $product["generic_name_fr"]     : !empty($product["generic_name"])     ? $product["generic_name"]     : $article["description"];
             array_push($formatted_articles, $article);
         }