diff --git a/Resources/Private/Partials/Calendar/Day.html b/Resources/Private/Partials/Calendar/Day.html
index b15b0a8102..0118d49e8a 100644
--- a/Resources/Private/Partials/Calendar/Day.html
+++ b/Resources/Private/Partials/Calendar/Day.html
@@ -13,29 +13,25 @@
       data-namespace-typo3-fluid="true">
 
 <f:if condition="{day}">
-    <f:then>
-        <div class="issues">
+    <div class="issues">
+        <f:if condition="{day.issues}">
+            <f:then>
+                <h4>{day.dayValue -> f:format.html()}</h4>
+            </f:then>
+            <f:else>
+                {day.dayValue -> f:format.html()}
+            </f:else>
+        </f:if>
+        <div class="dayLinkList">
             <f:if condition="{day.issues}">
-                <f:then>
-                    <h4>{day.dayValue -> f:format.html()}</h4>
-                </f:then>
-                <f:else>
-                    {day.dayValue -> f:format.html()}
-                </f:else>
+                <ul>
+                    <f:for each="{day.issues}" as="item">
+                        <li>
+                            <f:link.page pageUid="{settings.targetPid}" additionalParams="{'tx_dlf[id]': item.documentId}">{item.text}</f:link.page>
+                        </li>
+                    </f:for>
+                </ul>
             </f:if>
-            <div class="dayLinkList">
-                <f:if condition="{day.issues}">
-                    <ul>
-                        <f:for each="{day.issues}" as="item">
-                            <li>
-                                <f:link.page pageUid="{settings.targetPid}" additionalParams="{'tx_dlf[id]': item.documentId}">
-                                    {item.text}
-                                </f:link.page>
-                            </li>
-                        </f:for>
-                    </ul>
-                </f:if>
-            </div>
         </div>
-    </f:then>
+    </div>
 </f:if>
diff --git a/Resources/Private/Partials/Metadata/IiifEntries.html b/Resources/Private/Partials/Metadata/IiifEntries.html
index c2714ed0f6..9e1edcbe6c 100644
--- a/Resources/Private/Partials/Metadata/IiifEntries.html
+++ b/Resources/Private/Partials/Metadata/IiifEntries.html
@@ -18,11 +18,7 @@
         <f:then>
             <f:for each="{data.data}" as="subData" iteration="subIterator">
                 <f:if condition="{subIterator.isFirst}">
-                    <f:then>
-                        <span>
-                            <f:translate key="{key}" />
-                        </span>
-                    </f:then>
+                    <span><f:translate key="{key}" /></span>
                 </f:if>
                 <f:variable name="buildUrl" value="{subData.buildUrl}"/>
                 <f:variable name="entryData" value="{subData}"/>
diff --git a/Resources/Private/Partials/Navigation/MeasureBack.html b/Resources/Private/Partials/Navigation/MeasureBack.html
index e30aa2686e..c6f867d3d9 100644
--- a/Resources/Private/Partials/Navigation/MeasureBack.html
+++ b/Resources/Private/Partials/Navigation/MeasureBack.html
@@ -14,21 +14,19 @@
       data-namespace-typo3-fluid="true">
 
 <f:if condition="{numMeasures} > 0 && {double} != 1">
-    <f:then>
-        <div class="measureBacks">
-            <span class="prev">
-                <f:if condition="{currentMeasure} > 1">
-                    <f:then>
-                        <f:variable name="prevMeasure" value="{currentMeasure - 1}" />
-                        <kitodo:link viewData="{viewData}" additionalParams="{'measure':'{currentMeasure - 1}', 'page':'{measurePages.{prevMeasure}}'}"><f:translate key="prevMeasure"/></kitodo:link>
-                    </f:then>
-                    <f:else>
-                        <span title="{f:translate(key: 'prevPage')}"><f:translate key="prevMeasure"/></span>
-                    </f:else>
-                </f:if>
-            </span>
-        </div>
-    </f:then>
+    <div class="measureBacks">
+        <span class="prev">
+            <f:if condition="{currentMeasure} > 1">
+                <f:then>
+                    <f:variable name="prevMeasure" value="{currentMeasure - 1}" />
+                    <kitodo:link viewData="{viewData}" additionalParams="{'measure':'{currentMeasure - 1}', 'page':'{measurePages.{prevMeasure}}'}"><f:translate key="prevMeasure"/></kitodo:link>
+                </f:then>
+                <f:else>
+                    <span title="{f:translate(key: 'prevPage')}"><f:translate key="prevMeasure"/></span>
+                </f:else>
+            </f:if>
+        </span>
+    </div>
 </f:if>
 
 </html>
diff --git a/Resources/Private/Partials/Navigation/MeasureForward.html b/Resources/Private/Partials/Navigation/MeasureForward.html
index ef24cf5930..bf8d2c5935 100644
--- a/Resources/Private/Partials/Navigation/MeasureForward.html
+++ b/Resources/Private/Partials/Navigation/MeasureForward.html
@@ -14,28 +14,26 @@
       data-namespace-typo3-fluid="true">
 
 <f:if condition="{numMeasures} > 0 && {double} != 1">
-    <f:then>
-        <div class="measureFwds">
-            <span class="next">
-                <f:if condition="{currentMeasure} < {numMeasures}">
-                    <f:then>
-                        <f:if condition="{currentMeasure} > 0">
-                            <f:then>
-                                <f:variable name="nextMeasure" value="{currentMeasure + 1}" />
-                                <kitodo:link viewData="{viewData}" additionalParams="{'measure':'{nextMeasure}', 'page':'{measurePages.{nextMeasure}}'}"><f:translate key="nextMeasure"/></kitodo:link>
-                            </f:then>
-                            <f:else>
-                                <kitodo:link viewData="{viewData}" additionalParams="{'measure':'1', 'page':'{measurePages.1}'}"><f:translate key="nextMeasure"/></kitodo:link>
-                            </f:else>
-                        </f:if>
-                    </f:then>
-                    <f:else>
-                        <span title="{f:translate(key: 'nextMeasure')}"><f:translate key="nextMeasure"/></span>
-                    </f:else>
-                </f:if>
-            </span>
-        </div>
-    </f:then>
+    <div class="measureFwds">
+        <span class="next">
+            <f:if condition="{currentMeasure} < {numMeasures}">
+                <f:then>
+                    <f:if condition="{currentMeasure} > 0">
+                        <f:then>
+                            <f:variable name="nextMeasure" value="{currentMeasure + 1}" />
+                            <kitodo:link viewData="{viewData}" additionalParams="{'measure':'{nextMeasure}', 'page':'{measurePages.{nextMeasure}}'}"><f:translate key="nextMeasure"/></kitodo:link>
+                        </f:then>
+                        <f:else>
+                            <kitodo:link viewData="{viewData}" additionalParams="{'measure':'1', 'page':'{measurePages.1}'}"><f:translate key="nextMeasure"/></kitodo:link>
+                        </f:else>
+                    </f:if>
+                </f:then>
+                <f:else>
+                    <span title="{f:translate(key: 'nextMeasure')}"><f:translate key="nextMeasure"/></span>
+                </f:else>
+            </f:if>
+        </span>
+    </div>
 </f:if>
 
 </html>
diff --git a/Resources/Private/Partials/Search/Form.html b/Resources/Private/Partials/Search/Form.html
index 1b028d7e3e..bbde6ad893 100644
--- a/Resources/Private/Partials/Search/Form.html
+++ b/Resources/Private/Partials/Search/Form.html
@@ -24,11 +24,9 @@
     <f:form.textfield id="tx-dlf-search-query" property="query" value="{lastSearch.query}" />
 
     <f:if condition="{showLogicalPageField}">
-        <f:then>
-            <!-- Logical page -->
-            <label for="tx-dlf-search-logical-page"><f:translate key="search.logicalPage"/>: </label>
-            <f:form.textfield class="tx-dlf-search-logical-page" id="tx-dlf-search-logical-page" name="logicalPage" />
-        </f:then>
+        <!-- Logical page -->
+        <label for="tx-dlf-search-logical-page"><f:translate key="search.logicalPage"/>: </label>
+        <f:form.textfield class="tx-dlf-search-logical-page" id="tx-dlf-search-logical-page" name="logicalPage" />
     </f:if>
 
     <f:comment><!-- The following element is needed for auto-completion! --></f:comment>
@@ -68,9 +66,7 @@
 
     <f:comment><!-- Add current collection(s) if using on collection single view or collections-search --></f:comment>
     <f:if condition="{lastSearch.collection}">
-        <f:then>
-            <f:form.hidden property="collection" value="{lastSearch.collection}" />
-        </f:then>
+        <f:form.hidden property="collection" value="{lastSearch.collection}" />
     </f:if>
 
     <f:if condition="{extendedSlotCount}">
diff --git a/Resources/Private/Partials/Toolbox/ImageDownloadTool.html b/Resources/Private/Partials/Toolbox/ImageDownloadTool.html
index 976dd88040..ce0080bd63 100644
--- a/Resources/Private/Partials/Toolbox/ImageDownloadTool.html
+++ b/Resources/Private/Partials/Toolbox/ImageDownloadTool.html
@@ -25,13 +25,11 @@
                     <f:translate key="downloadLeftPage" /> {imageDownload.0.mimetypeLabel}
                 </f:link.external>
                 <f:if condition="{imageDownload.1}">
-                    <f:then>
-                        <span class="tx-dlf-tools-imagedownload">
-                            <f:link.external uri="{imageDownload.1.url}">
-                                <f:translate key="downloadRightPage" /> {imageDownload.1.mimetypeLabel}
-                            </f:link.external>
-                        </span>
-                    </f:then>
+                    <span class="tx-dlf-tools-imagedownload">
+                        <f:link.external uri="{imageDownload.1.url}">
+                            <f:translate key="downloadRightPage" /> {imageDownload.1.mimetypeLabel}
+                        </f:link.external>
+                    </span>
                 </f:if>
             </f:else>
         </f:if>
diff --git a/Resources/Private/Templates/Basket/Main.html b/Resources/Private/Templates/Basket/Main.html
index dcad80e2e0..0d299973e7 100644
--- a/Resources/Private/Templates/Basket/Main.html
+++ b/Resources/Private/Templates/Basket/Main.html
@@ -39,9 +39,7 @@
                             {entry.BASKETDATA.title}
                         </f:link.typolink>
                         <f:if condition="{entry.BASKETDATA.info}">
-                            <f:then>
-                                ({entry.BASKETDATA.info})
-                            </f:then>
+                            ({entry.BASKETDATA.info})
                         </f:if>
                     </dt>
                     <dd>
@@ -78,13 +76,11 @@
 </f:format.raw>
 
 <f:if condition="{settings.basketGoToButton}">
-    <f:then>
-        <div class="tx-dlf-goto-basket">
-            <f:link.page pageUid="{settings.targetBasket}">
-                <f:translate key="basket.goBasket"/>
-            </f:link.page>
-        </div>
-    </f:then>
+    <div class="tx-dlf-goto-basket">
+        <f:link.page pageUid="{settings.targetBasket}">
+            <f:translate key="basket.goBasket"/>
+        </f:link.page>
+    </div>
 </f:if>
 
 </html>
diff --git a/Resources/Private/Templates/Calendar/Calendar.html b/Resources/Private/Templates/Calendar/Calendar.html
index 71b45e6f63..f0c38184c2 100644
--- a/Resources/Private/Templates/Calendar/Calendar.html
+++ b/Resources/Private/Templates/Calendar/Calendar.html
@@ -37,11 +37,7 @@
 
         <f:for each="{calendarData}" as="month">
             <f:if condition="{month.CALYEAR}">
-                <f:then>
-                    <div class="year">
-                        {month.CALYEAR}
-                    </div>
-                </f:then>
+                <div class="year">{month.CALYEAR}</div>
             </f:if>
             <div class="month">
                 <table>
diff --git a/Resources/Private/Templates/OaiPmh/Main.xml b/Resources/Private/Templates/OaiPmh/Main.xml
index 5bac4a6551..7ec489ad94 100644
--- a/Resources/Private/Templates/OaiPmh/Main.xml
+++ b/Resources/Private/Templates/OaiPmh/Main.xml
@@ -107,9 +107,38 @@
 
 <f:section name="ListIdentifiers">
     <f:if condition="{listIdentifiers -> f:count()} >= 1 ">
-        <f:then>
-            <ListIdentifiers>
-                <f:for each="{listIdentifiers}" as="record">
+        <ListIdentifiers>
+            <f:for each="{listIdentifiers}" as="record">
+                <f:if condition="{record.deleted} || {record.hidden}">
+                    <f:then>
+                        <header status="deleted">
+                            <identifier>{record.record_id}</identifier>
+                            <datestamp><f:format.date format="Y-m-d\TH:i:s\Z">{record.tstamp}</f:format.date></datestamp>
+                        </header>
+                    </f:then>
+                    <f:else>
+                        <header>
+                            <identifier>{record.record_id}</identifier>
+                            <datestamp><f:format.date format="Y-m-d\TH:i:s\Z">{record.tstamp}</f:format.date></datestamp>
+                            <f:for each="{record.collections}" as="collection">
+                                <f:if condition="{collection}">
+                                    <setSpec>{collection}</setSpec>
+                                </f:if>
+                            </f:for>
+                        </header>
+                    </f:else>
+                </f:if>
+            </f:for>
+            <f:render section="resumptionToken" arguments="{resumptionToken: resumptionToken}" />
+        </ListIdentifiers>
+    </f:if>
+</f:section>
+
+<f:section name="ListRecords">
+    <f:if condition="{listRecords -> f:count()} >= 1 ">
+        <ListRecords>
+            <f:for each="{listRecords}" as="record">
+                <record>
                     <f:if condition="{record.deleted} || {record.hidden}">
                         <f:then>
                             <header status="deleted">
@@ -127,64 +156,29 @@
                                     </f:if>
                                 </f:for>
                             </header>
+                            <metadata>
+                                <f:render section="recordMetadata" arguments="{record: record, parameters: parameters}" />
+                            </metadata>
                         </f:else>
                     </f:if>
-                </f:for>
-                <f:render section="resumptionToken" arguments="{resumptionToken: resumptionToken}" />
-            </ListIdentifiers>
-        </f:then>
-    </f:if>
-</f:section>
-
-<f:section name="ListRecords">
-    <f:if condition="{listRecords -> f:count()} >= 1 ">
-        <f:then>
-            <ListRecords>
-                <f:for each="{listRecords}" as="record">
-                    <record>
-                        <f:if condition="{record.deleted} || {record.hidden}">
-                            <f:then>
-                                <header status="deleted">
-                                    <identifier>{record.record_id}</identifier>
-                                    <datestamp><f:format.date format="Y-m-d\TH:i:s\Z">{record.tstamp}</f:format.date></datestamp>
-                                </header>
-                            </f:then>
-                            <f:else>
-                                <header>
-                                    <identifier>{record.record_id}</identifier>
-                                    <datestamp><f:format.date format="Y-m-d\TH:i:s\Z">{record.tstamp}</f:format.date></datestamp>
-                                    <f:for each="{record.collections}" as="collection">
-                                        <f:if condition="{collection}">
-                                            <setSpec>{collection}</setSpec>
-                                        </f:if>
-                                    </f:for>
-                                </header>
-                                <metadata>
-                                    <f:render section="recordMetadata" arguments="{record: record, parameters: parameters}" />
-                                </metadata>
-                            </f:else>
-                        </f:if>
-                    </record>
-                </f:for>
-                <f:render section="resumptionToken" arguments="{resumptionToken: resumptionToken}" />
-            </ListRecords>
-        </f:then>
+                </record>
+            </f:for>
+            <f:render section="resumptionToken" arguments="{resumptionToken: resumptionToken}" />
+        </ListRecords>
     </f:if>
 </f:section>
 
 <f:section name="ListMetadataFormats">
     <f:if condition="{metadataFormats -> f:count()} >= 1 ">
-        <f:then>
-            <ListMetadataFormats>
-                <f:for each="{metadataFormats}" as="record">
-                    <metadataFormat>
-                        <metadataPrefix>{record.prefix}</metadataPrefix>
-                        <schema>{record.schema}</schema>
-                        <metadataNamespace>{record.namespace}</metadataNamespace>
-                    </metadataFormat>
-                </f:for>
-            </ListMetadataFormats>
-        </f:then>
+        <ListMetadataFormats>
+            <f:for each="{metadataFormats}" as="record">
+                <metadataFormat>
+                    <metadataPrefix>{record.prefix}</metadataPrefix>
+                    <schema>{record.schema}</schema>
+                    <metadataNamespace>{record.namespace}</metadataNamespace>
+                </metadataFormat>
+            </f:for>
+        </ListMetadataFormats>
     </f:if>
 </f:section>
 
diff --git a/Resources/Private/Templates/PageView/Main.html b/Resources/Private/Templates/PageView/Main.html
index b7d86d41a4..d2e294b0a4 100644
--- a/Resources/Private/Templates/PageView/Main.html
+++ b/Resources/Private/Templates/PageView/Main.html
@@ -21,26 +21,20 @@
 
 <f:if condition="{settings.basketButton} && {settings.targetBasket}">
     <f:if condition="{settings.basket.crop}">
-        <f:then>
-            <div class="tx-dlf-navigation-edit">
-                <a href="javascript: tx_dlf_viewer.activateSelection();" title="{f:translate(key: 'basket.editMode')}">
-                    <f:translate key="basket.editMode"/>
-                </a>
-            </div>
-            <div class="tx-dlf-navigation-editRemove">
-                <a href="javascript: tx_dlf_viewer.resetCropSelection();" title="{f:translate(key: 'basket.editRemove')}">
-                    <f:translate key="basket.editRemove"/>
-                </a>
-            </div>
-        </f:then>
+        <div class="tx-dlf-navigation-edit">
+            <a href="javascript: tx_dlf_viewer.activateSelection();" title="{f:translate(key: 'basket.editMode')}">
+                <f:translate key="basket.editMode"/>
+            </a>
+        </div>
+        <div class="tx-dlf-navigation-editRemove">
+            <a href="javascript: tx_dlf_viewer.resetCropSelection();" title="{f:translate(key: 'basket.editRemove')}">
+                <f:translate key="basket.editRemove"/>
+            </a>
+        </div>
     </f:if>
     <f:if condition="{settings.basket.magnifier}">
         <div class="tx-dlf-navigation-magnifier">
-            <f:then>
-                <a href="javascript: tx_dlf_viewer.activateMagnifier();" title="{f:translate(key: 'basket.magnifier')}">
-                    <f:translate key="basket.magnifier"/>
-                </a>
-            </f:then>
+            <a href="javascript: tx_dlf_viewer.activateMagnifier();" title="{f:translate(key: 'basket.magnifier')}"><f:translate key="basket.magnifier"/></a>
         </div>
     </f:if>
 
diff --git a/Resources/Private/Templates/Search/Main.html b/Resources/Private/Templates/Search/Main.html
index 4bb511e9b2..11c755d120 100644
--- a/Resources/Private/Templates/Search/Main.html
+++ b/Resources/Private/Templates/Search/Main.html
@@ -36,46 +36,44 @@
                     <f:translate key="LLL:EXT:dlf/Resources/Private/Language/locallang_metadata.xlf:metadata.{facet.field}" />
                 </span>
                 <f:if condition="{facet._SUB_MENU}">
-                    <f:then>
-                        <ul>
-                            <f:for each="{facet._SUB_MENU}" as="values">
-                                <f:if condition="{values.resetFacet}">
-                                    <f:then>
-                                        <li class="tx-dlf-search-cur">
-                                            <f:if condition="{lastSearch.dateFrom} || {lastSearch.dateTo}">
-                                                <f:then>
-                                                    <f:link.action title="{f:translate(key:'search.resetFacet', arguments:{0: '{values.title}'})}" additionalParams="{'tx_dlf_search[search][fq]':'{values.queryColumn}', 'tx_dlf_search[search][query]':'{lastSearch.query}', 'tx_dlf_search[search][collection]':'{lastSearch.collection}', 'tx_dlf_search[search][fulltext]':'{lastSearch.fulltext}', 'tx_dlf_search[search][order]':'{lastSearch.order}', 'tx_dlf_search[search][orderBy]':'{lastSearch.orderBy}', 'tx_dlf_search[search][extQuery]':'{lastSearch.extQuery}', 'tx_dlf_search[search][extField]':'{lastSearch.extField}', 'tx_dlf_search[search][extOperator]':'{lastSearch.extField}', 'tx_dlf_search[search][dateFrom]':'{lastSearch.dateFrom}', 'tx_dlf_search[search][dateTo]':'{lastSearch.dateTo}'}">
-                                                        {values.title} ({values.count})
-                                                    </f:link.action>
-                                                </f:then>
-                                                <f:else>
-                                                    <f:link.action title="{f:translate(key:'search.resetFacet', arguments:{0: '{values.title}'})}" additionalParams="{'tx_dlf_search[search][fq]':'{values.queryColumn}', 'tx_dlf_search[search][query]':'{lastSearch.query}', 'tx_dlf_search[search][collection]':'{lastSearch.collection}', 'tx_dlf_search[search][fulltext]':'{lastSearch.fulltext}', 'tx_dlf_search[search][order]':'{lastSearch.order}', 'tx_dlf_search[search][orderBy]':'{lastSearch.orderBy}', 'tx_dlf_search[search][extQuery]':'{lastSearch.extQuery}', 'tx_dlf_search[search][extField]':'{lastSearch.extField}', 'tx_dlf_search[search][extOperator]':'{lastSearch.extField}'}">
-                                                        {values.title} ({values.count})
-                                                    </f:link.action>
-                                                </f:else>
-                                            </f:if>
-                                        </li>
-                                    </f:then>
-                                    <f:else>
-                                        <li class="tx-dlf-search-no">
-                                            <f:if condition="{lastSearch.dateFrom} || {lastSearch.dateTo}">
-                                                <f:then>
-                                                    <f:link.action additionalParams="{'tx_dlf_search[search][fq]':'{values.queryColumn}', 'tx_dlf_search[search][query]':'{lastSearch.query}', 'tx_dlf_search[search][collection]':'{lastSearch.collection}', 'tx_dlf_search[search][fulltext]':'{lastSearch.fulltext}', 'tx_dlf_search[search][order]':'{lastSearch.order}', 'tx_dlf_search[search][orderBy]':'{lastSearch.orderBy}', 'tx_dlf_search[search][extQuery]':'{lastSearch.extQuery}', 'tx_dlf_search[search][extField]':'{lastSearch.extField}', 'tx_dlf_search[search][extOperator]':'{lastSearch.extField}', 'tx_dlf_search[search][dateFrom]':'{lastSearch.dateFrom}', 'tx_dlf_search[search][dateTo]':'{lastSearch.dateTo}'}">
-                                                        {values.title} ({values.count})
-                                                    </f:link.action>
-                                                </f:then>
-                                                <f:else>
-                                                    <f:link.action additionalParams="{'tx_dlf_search[search][fq]':'{values.queryColumn}', 'tx_dlf_search[search][query]':'{lastSearch.query}', 'tx_dlf_search[search][collection]':'{lastSearch.collection}', 'tx_dlf_search[search][fulltext]':'{lastSearch.fulltext}', 'tx_dlf_search[search][order]':'{lastSearch.order}', 'tx_dlf_search[search][orderBy]':'{lastSearch.orderBy}', 'tx_dlf_search[search][extQuery]':'{lastSearch.extQuery}', 'tx_dlf_search[search][extField]':'{lastSearch.extField}', 'tx_dlf_search[search][extOperator]':'{lastSearch.extField}'}">
-                                                        {values.title} ({values.count})
-                                                    </f:link.action>
-                                                </f:else>
-                                            </f:if>
-                                        </li>
-                                    </f:else>
-                                </f:if>
-                            </f:for>
-                        </ul>
-                    </f:then>
+                    <ul>
+                        <f:for each="{facet._SUB_MENU}" as="values">
+                            <f:if condition="{values.resetFacet}">
+                                <f:then>
+                                    <li class="tx-dlf-search-cur">
+                                        <f:if condition="{lastSearch.dateFrom} || {lastSearch.dateTo}">
+                                            <f:then>
+                                                <f:link.action title="{f:translate(key:'search.resetFacet', arguments:{0: '{values.title}'})}" additionalParams="{'tx_dlf_search[search][fq]':'{values.queryColumn}', 'tx_dlf_search[search][query]':'{lastSearch.query}', 'tx_dlf_search[search][collection]':'{lastSearch.collection}', 'tx_dlf_search[search][fulltext]':'{lastSearch.fulltext}', 'tx_dlf_search[search][order]':'{lastSearch.order}', 'tx_dlf_search[search][orderBy]':'{lastSearch.orderBy}', 'tx_dlf_search[search][extQuery]':'{lastSearch.extQuery}', 'tx_dlf_search[search][extField]':'{lastSearch.extField}', 'tx_dlf_search[search][extOperator]':'{lastSearch.extField}', 'tx_dlf_search[search][dateFrom]':'{lastSearch.dateFrom}', 'tx_dlf_search[search][dateTo]':'{lastSearch.dateTo}'}">
+                                                    {values.title} ({values.count})
+                                                </f:link.action>
+                                            </f:then>
+                                            <f:else>
+                                                <f:link.action title="{f:translate(key:'search.resetFacet', arguments:{0: '{values.title}'})}" additionalParams="{'tx_dlf_search[search][fq]':'{values.queryColumn}', 'tx_dlf_search[search][query]':'{lastSearch.query}', 'tx_dlf_search[search][collection]':'{lastSearch.collection}', 'tx_dlf_search[search][fulltext]':'{lastSearch.fulltext}', 'tx_dlf_search[search][order]':'{lastSearch.order}', 'tx_dlf_search[search][orderBy]':'{lastSearch.orderBy}', 'tx_dlf_search[search][extQuery]':'{lastSearch.extQuery}', 'tx_dlf_search[search][extField]':'{lastSearch.extField}', 'tx_dlf_search[search][extOperator]':'{lastSearch.extField}'}">
+                                                    {values.title} ({values.count})
+                                                </f:link.action>
+                                            </f:else>
+                                        </f:if>
+                                    </li>
+                                </f:then>
+                                <f:else>
+                                    <li class="tx-dlf-search-no">
+                                        <f:if condition="{lastSearch.dateFrom} || {lastSearch.dateTo}">
+                                            <f:then>
+                                                <f:link.action additionalParams="{'tx_dlf_search[search][fq]':'{values.queryColumn}', 'tx_dlf_search[search][query]':'{lastSearch.query}', 'tx_dlf_search[search][collection]':'{lastSearch.collection}', 'tx_dlf_search[search][fulltext]':'{lastSearch.fulltext}', 'tx_dlf_search[search][order]':'{lastSearch.order}', 'tx_dlf_search[search][orderBy]':'{lastSearch.orderBy}', 'tx_dlf_search[search][extQuery]':'{lastSearch.extQuery}', 'tx_dlf_search[search][extField]':'{lastSearch.extField}', 'tx_dlf_search[search][extOperator]':'{lastSearch.extField}', 'tx_dlf_search[search][dateFrom]':'{lastSearch.dateFrom}', 'tx_dlf_search[search][dateTo]':'{lastSearch.dateTo}'}">
+                                                    {values.title} ({values.count})
+                                                </f:link.action>
+                                            </f:then>
+                                            <f:else>
+                                                <f:link.action additionalParams="{'tx_dlf_search[search][fq]':'{values.queryColumn}', 'tx_dlf_search[search][query]':'{lastSearch.query}', 'tx_dlf_search[search][collection]':'{lastSearch.collection}', 'tx_dlf_search[search][fulltext]':'{lastSearch.fulltext}', 'tx_dlf_search[search][order]':'{lastSearch.order}', 'tx_dlf_search[search][orderBy]':'{lastSearch.orderBy}', 'tx_dlf_search[search][extQuery]':'{lastSearch.extQuery}', 'tx_dlf_search[search][extField]':'{lastSearch.extField}', 'tx_dlf_search[search][extOperator]':'{lastSearch.extField}'}">
+                                                    {values.title} ({values.count})
+                                                </f:link.action>
+                                            </f:else>
+                                        </f:if>
+                                    </li>
+                                </f:else>
+                            </f:if>
+                        </f:for>
+                    </ul>
                 </f:if>
             </li>
         </ul>
diff --git a/Resources/Private/Templates/Toolbox/Main.html b/Resources/Private/Templates/Toolbox/Main.html
index 9b77e9a27e..5bad7bb6cf 100644
--- a/Resources/Private/Templates/Toolbox/Main.html
+++ b/Resources/Private/Templates/Toolbox/Main.html
@@ -13,76 +13,52 @@
       data-namespace-typo3-fluid="true">
 
 <f:if condition="{multiViewAddSourceTool}">
-    <f:then>
-        <f:render partial="Toolbox/MultiViewAddSourceTool" arguments="{_all}" />
-    </f:then>
+    <f:render partial="Toolbox/MultiViewAddSourceTool" arguments="{_all}" />
 </f:if>
 
 <ul>
     <f:if condition="{renderAnnotationTool}">
-        <f:then>
-            <f:render partial="Toolbox/AnnotationTool" arguments="{_all}" />
-        </f:then>
+        <f:render partial="Toolbox/AnnotationTool" arguments="{_all}" />
     </f:if>
 
     <f:if condition="{renderImageManipulationTool}">
-        <f:then>
-            <f:render partial="Toolbox/ImageManipulationTool" arguments="{_all}" />
-        </f:then>
+        <f:render partial="Toolbox/ImageManipulationTool" arguments="{_all}" />
     </f:if>
 
     <f:if condition="{renderAudioVideoTool}">
-        <f:then>
-            <f:render partial="Toolbox/AudioVideoTool" arguments="{_all}" />
-        </f:then>
+        <f:render partial="Toolbox/AudioVideoTool" arguments="{_all}" />
     </f:if>
 
     <f:if condition="{renderImageDownloadTool} && {imageDownload}">
-        <f:then>
-            <f:render partial="Toolbox/ImageDownloadTool" arguments="{_all}" />
-        </f:then>
+        <f:render partial="Toolbox/ImageDownloadTool" arguments="{_all}" />
     </f:if>
 
     <f:if condition="{renderModelDownloadTool} && {modelUrl}">
-        <f:then>
-            <f:render partial="Toolbox/ModelDownloadTool" arguments="{_all}" />
-        </f:then>
+        <f:render partial="Toolbox/ModelDownloadTool" arguments="{_all}" />
     </f:if>
 
     <f:if condition="{renderViewerSelectionTool} && {viewers}">
-        <f:then>
-            <f:render partial="Toolbox/ViewerSelectionTool" arguments="{_all}" />
-        </f:then>
+        <f:render partial="Toolbox/ViewerSelectionTool" arguments="{_all}" />
     </f:if>
 
     <f:if condition="{renderFulltextTool}">
-        <f:then>
-            <f:render partial="Toolbox/FulltextTool" arguments="{_all}" />
-        </f:then>
+        <f:render partial="Toolbox/FulltextTool" arguments="{_all}" />
     </f:if>
 
     <f:if condition="{renderFulltextDownloadTool}">
-        <f:then>
-            <f:render partial="Toolbox/FulltextDownloadTool" arguments="{_all}" />
-        </f:then>
+        <f:render partial="Toolbox/FulltextDownloadTool" arguments="{_all}" />
     </f:if>
 
     <f:if condition="{renderScoreTool} && {score}">
-        <f:then>
-            <f:render partial="Toolbox/ScoreTool" arguments="{_all}" />
-        </f:then>
+        <f:render partial="Toolbox/ScoreTool" arguments="{_all}" />
     </f:if>
 
     <f:if condition="{renderPdfDownloadTool}">
-        <f:then>
-            <f:render partial="Toolbox/PdfDownloadTool" arguments="{_all}" />
-        </f:then>
+        <f:render partial="Toolbox/PdfDownloadTool" arguments="{_all}" />
     </f:if>
 
     <f:if condition="{renderSearchInDocumentTool} && {searchInDocument}">
-        <f:then>
-            <f:render partial="Toolbox/SearchInDocumentTool" arguments="{_all}" />
-        </f:then>
+        <f:render partial="Toolbox/SearchInDocumentTool" arguments="{_all}" />
     </f:if>
 </ul>