diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/City/Teaser.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/City/Teaser.html
index a37aee9e..5027fd62 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/City/Teaser.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/City/Teaser.html
@@ -4,32 +4,29 @@
       xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
 
     <f:section name="Teaser">
-        <f:link.typolink parameter="{city.detailPage}"
-                         title="{city.name}">
-            <div class="flex flex-col">
-                <div class="relative">
-                    <svg class="w-8 h-6 absolute top-0 left-0">
-                        <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-flag-{city.country.code -> f:format.case(mode: 'lower')}"></use>
-                    </svg>
-                    <ep:lazyLoadImage image="{city.teaserImage}"
-                                      loaderimg="EXT:ep_theme/Resources/Public/images/lazy.png"
-                                      class="block w-full h-full object-cover"
-                                      width="360c"
-                                      height="270c"
-                                      alt="{city.name}" />
-                </div>
-                <div class="flex-1 py-4 px-2 bg-white border-l border-r border-gray-200">
-                    <span class="headline--3 mb-4">
-                        {city.name}
-                    </span>
-                    {city.teaser -> f:format.crop(maxCharacters: settings.teaserTextMaxChars) -> f:format.html()}
-                </div>
-                <button type="button"
-                        class="button w-full">
-                    {f:translate(key: 'tx_eptheme.label.teaserbutton.default', extensionName: 'ep_theme')}
-                </button>
+        <a href="{f:uri.typolink(parameter: city.detailPage)}" class="flex flex-col" title="{city.name}">
+            <div class="relative">
+                <svg class="w-8 h-6 absolute top-0 left-0">
+                    <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-flag-{city.country.code -> f:format.case(mode: 'lower')}"></use>
+                </svg>
+                <ep:lazyLoadImage image="{city.teaserImage}"
+                                  loaderimg="EXT:ep_theme/Resources/Public/images/lazy.png"
+                                  class="block w-full h-full object-cover"
+                                  width="360c"
+                                  height="270c"
+                                  alt="{city.name}" />
             </div>
-        </f:link.typolink>
+            <div class="flex-1 py-4 px-2 bg-white border-l border-r border-gray-200">
+                <span class="headline--3 mb-4">
+                    {city.name}
+                </span>
+                {city.teaser -> f:format.crop(maxCharacters: settings.teaserTextMaxChars) -> f:format.html()}
+            </div>
+            <button type="button"
+                    class="button w-full">
+                {f:translate(key: 'tx_eptheme.label.teaserbutton.default', extensionName: 'ep_theme')}
+            </button>
+        </a>
     </f:section>
 
 </html>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Concept/Teaser.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Concept/Teaser.html
index 385180ee..d87a84bc 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Concept/Teaser.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Concept/Teaser.html
@@ -4,28 +4,25 @@
       xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
 
 <f:section name="Teaser">
-    <f:link.typolink parameter="{concept.detailPage}"
-                     title="{concept.name}">
-        <div class="flex flex-col">
-            <div class="relative">
-                <ep:lazyLoadImage image="{concept.teaserImage}"
-                                  loaderimg="EXT:ep_theme/Resources/Public/images/lazy.png"
-                                  class="block w-full h-full object-cover"
-                                  width="360c"
-                                  height="270c"
-                                  alt="{concept.name}" />
-                <div class="absolute top-0 left-0 inset-0 bg-concept-{concept.code}-overlay">
-                    <div class="flex h-full w-full p-4 items-end headline--3 text-white">
-                        {concept.name}
-                    </div>
+    <a href="{f:uri.typolink(parameter: concept.detailPage)}" title="{concept.name}" class="flex flex-col">
+        <div class="relative">
+            <ep:lazyLoadImage image="{concept.teaserImage}"
+                              loaderimg="EXT:ep_theme/Resources/Public/images/lazy.png"
+                              class="block w-full h-full object-cover"
+                              width="360c"
+                              height="270c"
+                              alt="{concept.name}" />
+            <div class="absolute top-0 left-0 inset-0 bg-concept-{concept.code}-overlay">
+                <div class="flex h-full w-full p-4 items-end headline--3 text-white">
+                    {concept.name}
                 </div>
             </div>
-            <div class="p-4 flex-1">
-                {concept.teaser -> f:format.crop(maxCharacters: settings.teaserTextMaxChars) -> f:format.html()}
-            </div>
-            <div class="bg-concept-{concept.code} h-1 w-20"></div>
         </div>
-    </f:link.typolink>
+        <div class="p-4 flex-1">
+            {concept.teaser -> f:format.crop(maxCharacters: settings.teaserTextMaxChars) -> f:format.html()}
+        </div>
+        <div class="bg-concept-{concept.code} h-1 w-20"></div>
+    </a>
 </f:section>
 
 </html>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Hotel/Teaser.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Hotel/Teaser.html
index ba482d4e..6c249e36 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Hotel/Teaser.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Hotel/Teaser.html
@@ -4,42 +4,39 @@
       xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
 
     <f:section name="Teaser">
-        <f:link.typolink parameter="{hotel.detailPage}"
-                         title="{hotel.name}">
-            <div class="flex flex-col">
-                <div class="relative">
-                    <svg class="w-8 h-6 absolute top-0 left-0">
-                        <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-flag-{hotel.country.code -> f:format.case(mode: 'lower')}"></use>
-                    </svg>
-                    <ep:lazyLoadImage image="{hotel.images.original.0}"
-                                      loaderimg="EXT:ep_theme/Resources/Public/images/lazy.png"
-                                      class="block w-full h-full object-cover"
-                                      width="360c"
-                                      height="270c"
-                                      alt="{hotel.name}" />
-                </div>
-                <div class="flex-1 py-4 px-2 bg-white border-l border-r border-gray-200">
-                    <span class="headline--3 mb-4">
-                        {hotel.name -> f:format.nl2br()}
-                    </span>
-                    <f:if condition="{hotel.category}">
-                        <span class="searchresult-item__category">
-                            <strong>Kategorie</strong> {hotel.category}
-                        </span>
-                    </f:if>
-                    {hotel.teaser -> f:format.crop(maxCharacters: settings.teaserTextMaxChars) -> f:format.html()}
-                    <f:if condition="{hotel.available} != -1">
-                        <span class="teaserbox__price">
-                            <strong>{f:if(condition: '{hotel.available} > 0', then: 'ab {hotel.minPrice} €', else: 'ausgebucht')}</strong>
-                        </span>
-                    </f:if>
-                </div>
-                <button type="button"
-                        class="button w-full">
-                    {f:translate(key: 'tx_eptheme.label.teaserbutton.default', extensionName: 'ep_theme')}
-                </button>
+        <a href="{f:uri.typolink(parameter: hotel.detailPage)}" title="{hotel.name}" class="flex flex-col">
+            <div class="relative">
+                <svg class="w-8 h-6 absolute top-0 left-0">
+                    <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-flag-{hotel.country.code -> f:format.case(mode: 'lower')}"></use>
+                </svg>
+                <ep:lazyLoadImage image="{hotel.images.original.0}"
+                                  loaderimg="EXT:ep_theme/Resources/Public/images/lazy.png"
+                                  class="block w-full h-full object-cover"
+                                  width="360c"
+                                  height="270c"
+                                  alt="{hotel.name}" />
             </div>
-        </f:link.typolink>
+            <div class="flex-1 py-4 px-2 bg-white border-l border-r border-gray-200">
+                <span class="headline--3 mb-4">
+                    {hotel.name -> f:format.nl2br()}
+                </span>
+                <f:if condition="{hotel.category}">
+                    <span class="searchresult-item__category">
+                        <strong>Kategorie</strong> {hotel.category}
+                    </span>
+                </f:if>
+                {hotel.teaser -> f:format.crop(maxCharacters: settings.teaserTextMaxChars) -> f:format.html()}
+                <f:if condition="{hotel.available} != -1">
+                    <span class="teaserbox__price">
+                        <strong>{f:if(condition: '{hotel.available} > 0', then: 'ab {hotel.minPrice} €', else: 'ausgebucht')}</strong>
+                    </span>
+                </f:if>
+            </div>
+            <button type="button"
+                    class="button w-full">
+                {f:translate(key: 'tx_eptheme.label.teaserbutton.default', extensionName: 'ep_theme')}
+            </button>
+        </a>
     </f:section>
 
 </html>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Region/Teaser.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Region/Teaser.html
index 5334453c..bc236fc0 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Region/Teaser.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Region/Teaser.html
@@ -4,32 +4,29 @@
       xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
 
     <f:section name="Teaser">
-        <f:link.typolink parameter="{region.detailPage}"
-                         title="{region.name}">
-            <div class="flex flex-col">
-                <div class="relative">
-                    <svg class="w-8 h-6 absolute top-0 left-0">
-                        <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-flag-{region.country.code -> f:format.case(mode: 'lower')}"></use>
-                    </svg>
-                    <ep:lazyLoadImage image="{region.teaserImages.0}"
-                                      loaderimg="EXT:ep_theme/Resources/Public/images/lazy.png"
-                                      class="block w-full h-full object-cover"
-                                      width="360c"
-                                      height="270c"
-                                      alt="{region.name}" />
-                </div>
-                <div class="flex-1 py-4 px-2 bg-white border-l border-r border-gray-200" data-rte-content>
-                    <span class="headline--3 mb-4">
-                        {region.name}
-                    </span>
-                    {region.teaser -> f:format.crop(maxCharacters: settings.teaserTextMaxChars) -> f:format.html()}
-                </div>
-                <button type="button"
-                        class="button w-full">
-                    {f:translate(key: 'tx_eptheme.label.teaserbutton.default', extensionName: 'ep_theme')}
-                </button>
+        <a href="{f:uri.typolink(parameter: region.detailPage)}" title="{region.name}" class="flex flex-col">
+            <div class="relative">
+                <svg class="w-8 h-6 absolute top-0 left-0">
+                    <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-flag-{region.country.code -> f:format.case(mode: 'lower')}"></use>
+                </svg>
+                <ep:lazyLoadImage image="{region.teaserImages.0}"
+                                  loaderimg="EXT:ep_theme/Resources/Public/images/lazy.png"
+                                  class="block w-full h-full object-cover"
+                                  width="360c"
+                                  height="270c"
+                                  alt="{region.name}" />
             </div>
-        </f:link.typolink>
+            <div class="flex-1 py-4 px-2 bg-white border-l border-r border-gray-200" data-rte-content>
+                <span class="headline--3 mb-4">
+                    {region.name}
+                </span>
+                {region.teaser -> f:format.crop(maxCharacters: settings.teaserTextMaxChars) -> f:format.html()}
+            </div>
+            <button type="button"
+                    class="button w-full">
+                {f:translate(key: 'tx_eptheme.label.teaserbutton.default', extensionName: 'ep_theme')}
+            </button>
+        </a>
     </f:section>
 
 </html>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/OneColumn.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/OneColumn.html
index 7fc90835..dea73bab 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/OneColumn.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/OneColumn.html
@@ -4,34 +4,31 @@
       xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
 
     <f:section name="Teaser">
-        <f:link.typolink parameter="{data.header_link}"
-                         class="group">
-            <div class="flex flex-col">
-                <div class="relative">
-                    <f:if condition="{context.country}">
-                        <svg class="w-8 h-6 absolute top-0 left-0">
-                            <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-flag-{context.country.code -> f:format.case(mode: 'lower')}"></use>
-                        </svg>
-                    </f:if>
-                    <ep:lazyLoadImage image="{teaserImage}"
-                                      loaderimg="EXT:ep_theme/Resources/Public/images/lazy.png"
-                                      class="block w-full h-full object-cover"
-                                      width="360c"
-                                      height="270c"
-                                      alt="{teaserImage.alternative}" />
-                </div>
-                <div class="flex-1 py-4 px-2 bg-white border-l border-r border-gray-200" data-rte-content>
-                    <span class="headline--3 mb-4">
-                        {data.header -> f:format.nl2br()}{f:if(condition: data.subheader, then: '<br>{data.subheader}')}
-                    </span>
-                    {data.bodytext -> f:format.html()}
-                </div>
-                <button type="button"
-                        class="button w-full">
-                    {data.button -> v:or(alternative: 'Details')}
-                </button>
+        <a href="{f:uri.typolink(parameter: data.header_link)}" class="flex flex-col group">
+            <div class="relative">
+                <f:if condition="{context.country}">
+                    <svg class="w-8 h-6 absolute top-0 left-0">
+                        <use href="{f:uri.image(src: 'EXT:ep_theme/Resources/Public/images/icons_sprite.svg')}#icon-flag-{context.country.code -> f:format.case(mode: 'lower')}"></use>
+                    </svg>
+                </f:if>
+                <ep:lazyLoadImage image="{teaserImage}"
+                                  loaderimg="EXT:ep_theme/Resources/Public/images/lazy.png"
+                                  class="block w-full h-full object-cover"
+                                  width="360c"
+                                  height="270c"
+                                  alt="{teaserImage.alternative}" />
             </div>
-        </f:link.typolink>
+            <div class="flex-1 py-4 px-2 bg-white border-l border-r border-gray-200" data-rte-content>
+                <span class="headline--3 mb-4">
+                    {data.header -> f:format.nl2br()}{f:if(condition: data.subheader, then: '<br>{data.subheader}')}
+                </span>
+                {data.bodytext -> f:format.html()}
+            </div>
+            <button type="button"
+                    class="button w-full">
+                {data.button -> v:or(alternative: 'Details')}
+            </button>
+        </a>
     </f:section>
 
 </html>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/TwoColumn.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/TwoColumn.html
index 6ab4e1ec..c5eafe44 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/TwoColumn.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Teaser/TwoColumn.html
@@ -4,8 +4,7 @@
       xmlns:f="http://typo3.org/ns/fluid/ViewHelpers">
 
     <f:section name="Teaser">
-        <f:link.typolink parameter="{data.header_link}"
-                         class="teaserbox teaserbox--default group">
+        <a href="{f:uri.typolink(parameter: data.header_link)}" class="teaserbox teaserbox--default group">
             <div class="teasebox__image">
                 <f:render partial="TeaserImage" arguments="{image: teaserImage}"/>
             </div>
@@ -20,7 +19,7 @@
                     class="button button--full">
                 {data.button -> v:or(alternative: 'Details')}
             </button>
-        </f:link.typolink>
+        </a>
     </f:section>
 
 </html>