diff --git a/Resources/Private/Plugins/Kitodo/Templates/Search/Main.html b/Resources/Private/Plugins/Kitodo/Templates/Search/Main.html
index 59b3b1d..65ff6d8 100644
--- a/Resources/Private/Plugins/Kitodo/Templates/Search/Main.html
+++ b/Resources/Private/Plugins/Kitodo/Templates/Search/Main.html
@@ -74,8 +74,8 @@
         </f:if>
 
         <f:if condition="{extendedSlotCount}">
-            <div class="tx-dlf-search-extended">
-                <f:for each="{extendedSlotCount}" as="slot" iteration="slot_iterator">
+            <f:for each="{extendedSlotCount}" as="slot" iteration="slot_iterator">
+                <div class="tx-dlf-search-extended">
                     <f:form.select property="extOperator.{slot_iterator.index}" value="{lastSearch.extOperator}" class="tx-dlf-search-operator tx-dlf-search-operator-{slot_iterator.index}">
                         <f:for each="{operators}" as="operator">
                             <f:form.select.option value="{operator}" class="tx-dlf-search-operator-option tx-dlf-search-operator-{operator}">
@@ -83,7 +83,7 @@
                             </f:form.select.option>
                         </f:for>
                     </f:form.select>
-                    <f:form.select property="extField.{slot_iterator.index}" value="{lastSearch.extField}" class="tx-dlf-search-field-option tx-dlf-search-field-{slot_iterator.index}">
+                    <f:form.select property="extField.{slot_iterator.index}" value="{lastSearch.extField}" class="tx-dlf-search-field tx-dlf-search-field-{slot_iterator.index}">
                         <f:for each="{searchFields}" as="searchField">
                             <f:form.select.option value="{searchField}" class="tx-dlf-search-field-option tx-dlf-search-field-{searchField}">
                                 <f:translate key="LLL:EXT:dlf/Resources/Private/Language/locallang_metadata.xlf:metadata.{searchField}" />
@@ -94,8 +94,8 @@
                         property="extQuery.{slot_iterator.index}"
                         class="tx-dlf-search-query tx-dlf-search-query-{slot_iterator.index}"
                         value="{lastSearch.extQuery.{slot_iterator.index}}" />
-                </f:for>
-            </div>
+                </div>
+            </f:for>
         </f:if>
 
         <f:if condition="{settings.datesearch}">