diff --git a/components/Organisms/Modules/StoreDelivery/StoreDelivery.twig b/components/Organisms/Modules/StoreDelivery/StoreDelivery.twig
index 3850784..ae5b747 100644
--- a/components/Organisms/Modules/StoreDelivery/StoreDelivery.twig
+++ b/components/Organisms/Modules/StoreDelivery/StoreDelivery.twig
@@ -51,12 +51,16 @@
         {% endif %}
 
         {% if not newClient %}
-        <span class='StoreDelivery-opening {% if closed %}closed{% endif %}'>{{ 'Close'|trans }}{% else %}{{ 'Open'|trans }}{% endif %}{{ 'currently'|trans }}</span>
-        <span class='StoreDelivery-address'>
-          <span>{{ address.address1 }},</span>
-          {% if address.address2 %}<span>{{ address.address2 }},</span>{% endif %}
-          <span>{{ address.zipCode }} {{ address.city }}</span>
-        </span>
+          {% if closed %}
+            <span class='StoreDelivery-opening closed'>{{ 'Close'|trans }} {{ 'currently'|trans }}</span>
+          {% else %}
+            <span class='StoreDelivery-opening'>{{ 'Open'|trans }} {{ 'currently'|trans }}</span>
+          {% endif %}
+          <span class='StoreDelivery-address'>
+            <span>{{ address.address1 }},</span>
+            {% if address.address2 %}<span>{{ address.address2 }},</span>{% endif %}
+            <span>{{ address.zipCode }} {{ address.city }}</span>
+          </span>
         {% endif %}
 
     </span>
diff --git a/components/Organisms/ProductCard/ProductCard.twig b/components/Organisms/ProductCard/ProductCard.twig
index 9c15069..8156c45 100644
--- a/components/Organisms/ProductCard/ProductCard.twig
+++ b/components/Organisms/ProductCard/ProductCard.twig
@@ -28,10 +28,21 @@
 {% set quantityChoice = quantityChoice|default(1) %}
 
 {%  if productSaleElements is defined %}
-  {% set price = productSaleElements|filter(pse => pse.isDefault)|first.productPrices|first.price ~ '€' %}
-  {% set promoPrice = productSaleElements|filter(pse => pse.isDefault)|first.productPrices|first.promoPrice ~ '€' %}
-  {% set isPromo = productSaleElements|filter(pse => pse.isDefault)|first.promo %}
-  {% set isNew = productSaleElements|filter(pse => pse.isDefault)|first.newness %}
+
+  {% set defaultPse = null %}
+
+  {% for pse in productSaleElements %}
+    {% if pse.isDefault %}
+      {% set defaultPse = pse %}
+    {% endif %}
+  {% endfor %}
+
+  {% set price = defaultPse.productPrices|first.price ~ '€' %}
+  {% set promoPrice = defaultPse.productPrices|first.promoPrice ~ '€' %}
+
+  {% set isPromo = defaultPse ? defaultPse.promo|default(false) : false %}
+  {% set isNew = defaultPse ? defaultPse.newness|default(false) : false %}
+
 {% endif %}
 {%  if id is defined and img is not defined %}
   {% set images = resources('/api/front/product_images', {'product.id':id, itemsPerPage:1}) %}
diff --git a/twig/custom-twig.ts b/twig/custom-twig.ts
index e0dbac6..81b6603 100644
--- a/twig/custom-twig.ts
+++ b/twig/custom-twig.ts
@@ -4,3 +4,17 @@ import IconTwig from './IconTwig.twig';
 Twig.extendFunction('svg', (iconName: string): string => {
   return IconTwig({ icon: iconName });
 });
+
+Twig.extend(function (Twig) {
+  Twig.filters.trans = function (value) {
+    return value;
+  };
+
+  Twig.exports.functions.t = function (value) {
+    return value;
+  };
+
+  Twig.exports.functions.resources = function (value) {
+    return value;
+  };
+});