diff --git a/archiv/forms.py b/archiv/forms.py
index 3ec8d58..d589ea5 100644
--- a/archiv/forms.py
+++ b/archiv/forms.py
@@ -116,25 +116,31 @@ def __init__(self, *args, **kwargs):
             BS5Accordion(
                 AccordionGroup(
                     "Basic Search",
-                    "id",
                     "ft_search",
                     "partial_legal_system",
                     "court",
-                    "year_book_title",
                     "decission_date__year",
-                    "file_number",
-                    "party",
-                    "location",
-                    "short_description",
-                    "situation",
-                    "motto",
-                    "commentary",
-                    "additional_information",
+                    # "location",
+                    # "short_description",
+                    # "situation",
+                    # "motto",
+                    # "commentary",
+                    # "additional_information",
                     "keyword",
                     "tag",
+                    css_id="basic",
+                ),
+                AccordionGroup(
+                    "Extended search fields",
+                    "party",
+                    "file_number",
+                    "id",
+                    "ecli",
+                    "year_book_title",
                     "author",
-                    css_id="more",
-                )
+                    css_id="extended",
+                ),
+                always_open=True
             )
         )
 
diff --git a/archiv/templates/archiv/case_listview.html b/archiv/templates/archiv/case_listview.html
index f4dbfc2..b918c72 100644
--- a/archiv/templates/archiv/case_listview.html
+++ b/archiv/templates/archiv/case_listview.html
@@ -42,7 +42,7 @@ <h1 class="text-center">{{table.paginator.count }} {{ verbose_name_plural }}</h1
             </div>
             <div class="col-md-8" id="results">
 
-               
+
                 <div class="card-body table-responsive">
                     {% block table %}
                     {% include 'browsing/partials/table.html' %}
@@ -67,4 +67,21 @@ <h1 class="text-center">{{table.paginator.count }} {{ verbose_name_plural }}</h1
 {% block scripts2 %}
 <script src="{% static 'browsing/js/set-form-attributes.js' %}"></script>
 <script src="{% static 'browsing/js/filter-for-blank-fields.js' %}"></script>
+<script>
+
+    document.addEventListener('DOMContentLoaded', function () {
+        var accordion = document.getElementsByClassName('accordion')[0];
+        accordion.addEventListener('shown.bs.collapse', function (event) {
+            var shownElement = event.target;
+            var allSelect2Spans = document.getElementsByClassName("select2");
+            var firstSpan = allSelect2Spans[0];
+            var widthToset = allSelect2Spans[0].style["width"];
+            for (var i = 0; i < allSelect2Spans.length; i++) {
+                allSelect2Spans[i].style.width = widthToset;
+            }
+        });
+    });
+
+
+</script>
 {% endblock scripts2 %}
\ No newline at end of file