diff --git a/templates/portfolio.html.twig b/templates/portfolio.html.twig
index 967fa24..acd5b9b 100644
--- a/templates/portfolio.html.twig
+++ b/templates/portfolio.html.twig
@@ -1,5 +1,7 @@
 {% extends 'partials/base.html.twig' %}
-
+{% set image = page.media[page.header.primaryImage] %}
+{% set title = page.title|raw %}
+{% set subtitle = page.header.subtitle|raw %}
 {% set columns = page.header.layout == 'standard' ? 'col-4 col-6-medium col-12-small' : 'col-6 col-12-small'  %}
 
 {% block menu %}
@@ -11,14 +13,14 @@
   <article class="post">
     <header>
       <div class="title">
-        <h2>{{ page.header.title }}</h2>
-        {% if page.header.subtitle %}
-          <p>{{ page.header.subtitle }}</p>
+        <h2>{{ title }}</h2>
+        {% if subtitle %}
+          <p>{{ subtitle }}</p>
         {% endif %}
       </div>
     </header>
-    {% if page.header.primaryImage %}
-      {{ page.media[page.header.primaryImage].cropZoom(1038,437).loading('lazy').html(page.title, page.title, 'image featured')|raw }}
+    {% if image %}
+      {{ image.cropZoom(1038,437).loading('lazy').html(title, title, 'image featured')|raw }}
     {% endif %}
 
     {{ page.content|raw}}