diff --git a/app/views/events/_filter.html.erb b/app/views/events/_filter.html.erb
index a6c0e219e..80c6ab48d 100644
--- a/app/views/events/_filter.html.erb
+++ b/app/views/events/_filter.html.erb
@@ -19,14 +19,13 @@
 				filter_selected_class: "selected" } do %>
 		<%= render "events/filter/header" %>
 		<%= render "events/filter/new_collection_option" %>
-		<% if Current.user.collections.count > 1 %>
+		<% if Current.user.collections.count > 15 %>
 			<input placeholder="Find a collection…" class="input input--transparent txt-small" type="search" autocorrect="off" autocomplete="off" data-1p-ignore="true" data-action="input->filter#filter" autofocus>
 		<% end %>
+		<%= render "events/filter/custom_collections" %>
 		<%= form_with url: events_path, method: :get, class: "flex flex-column max-width popup__list full-width",
 					data: { controller: "form" } do |form| %>
 			<%= render "events/filter/all_collections_option", form: form, filter: filter %>
-			<hr class="full-width separator--horizontal margin-none" style="--border-color: transparent;">
-			<%= render "events/filter/custom_collections" %>
 			<menu data-filter-target="list" contents>
 				<%= render partial: "events/filter/collection_option", collection: Current.user.collections, as: :collection, locals: { form: form, filter: filter } %>
 			</menu>
diff --git a/app/views/events/filter/_custom_collections.html.erb b/app/views/events/filter/_custom_collections.html.erb
index bea8bea91..f3a07e15e 100644
--- a/app/views/events/filter/_custom_collections.html.erb
+++ b/app/views/events/filter/_custom_collections.html.erb
@@ -1,28 +1,27 @@
 <div class="flex flex-column max-width popup__list full-width">
-  <li class="popup__group flex align-center full-width gap-half overflow-ellipsis" data-value="assigned to me">
+  <div class="popup__group flex align-center full-width gap-half overflow-ellipsis">
     <%= link_to cards_path(assignee_ids: [Current.user.id]), class: "btn popup__new popup__item", style: "view-transition-name: new-collection" do %>
       <%= icon_tag "filter" %>
       <span class="overflow-ellipsis">Assigned to me</span>
       <span class="translucent flex-item-no-shrink flex-item-justify-end"> ›</span>
     <% end %>
-  </li>
+  </div>
 
-  <li class="popup__group flex align-center full-width gap-half overflow-ellipsis" data-value="reported by me">
+  <div class="popup__group flex align-center full-width gap-half overflow-ellipsis">
     <%= link_to cards_path(creator_ids: [Current.user.id]), class: "btn popup__new popup__item", style: "view-transition-name: new-collection" do %>
       <%= icon_tag "filter" %>
       <span class="overflow-ellipsis">Reported by me</span>
       <span class="translucent flex-item-no-shrink flex-item-justify-end"> ›</span>
     <% end %>
-  </li>
+  </div>
 
   <% @filters.each do |filter| %>
-    <li class="popup__group flex align-center full-width gap-half overflow-ellipsis" data-value="<%= filter.summary.downcase %>">
+    <div class="popup__group flex align-center full-width gap-half overflow-ellipsis">
       <%= link_to cards_path(**filter.as_params), class: "btn popup__new popup__item", style: "view-transition-name: new-collection" do %>
         <%= icon_tag "filter" %>
         <span class="overflow-ellipsis"><%= filter.summary %></span>
         <span class="translucent flex-item-no-shrink flex-item-justify-end"> ›</span>
       <% end %>
-    </li>
+    </div>
   <% end %>
-</div>
-<hr class="full-width separator--horizontal margin-none" style="--border-color: transparent;">
\ No newline at end of file
+</div>
\ No newline at end of file