diff --git a/app/views/accounts/_user.html.erb b/app/views/accounts/_user.html.erb
index 4c9c8768b..cdf3c9beb 100644
--- a/app/views/accounts/_user.html.erb
+++ b/app/views/accounts/_user.html.erb
@@ -1,4 +1,4 @@
-<li class="flex align-center gap-half pad-inline" data-filter-target="item" data-filter-text-value="<%= filterable_name(user.name) %>">
+<li class="flex align-center gap-half pad-inline" data-filter-target="item">
   <%= avatar_tag user %>
 
   <strong class="overflow-ellipsis">
diff --git a/app/views/cards/assignments/new.html.erb b/app/views/cards/assignments/new.html.erb
index b1d8728b9..fc393908a 100644
--- a/app/views/cards/assignments/new.html.erb
+++ b/app/views/cards/assignments/new.html.erb
@@ -14,7 +14,7 @@
 
     <ul class="popup__list" data-filter-target="list">
       <% @collection.users.active.alphabetically.each do |user| %>
-        <li class="popup__group flex align-center full-width" data-filter-text-value="<%= filterable_name(user.name) %>" data-filter-target="item" data-navigable-list-target="item">
+        <li class="popup__group flex align-center full-width" data-filter-target="item" data-navigable-list-target="item">
           <%= button_to card_assignments_path(@card, params: { assignee_id: user.id }), method: :post,
               class: "btn popup__item min-width flex-item-grow full-width unpad-inline",
               form_class: "max-width flex-item-grow" do %>
diff --git a/app/views/cards/display/perma/_collection.html.erb b/app/views/cards/display/perma/_collection.html.erb
index 40f88f7cd..a2d77283e 100644
--- a/app/views/cards/display/perma/_collection.html.erb
+++ b/app/views/cards/display/perma/_collection.html.erb
@@ -21,7 +21,7 @@
 
         <ul class="popup__list margin-block-start-half margin-none-block-end" data-filter-target="list">
           <% Current.user.collections.alphabetically.each do |collection| %>
-            <li class="popup__group flex align-center full-width" data-filter-text-value="<%= filterable_name(collection.name) %>" data-filter-target="item" data-navigable-list-target="item">
+            <li class="popup__group flex align-center full-width" data-filter-target="item" data-navigable-list-target="item">
               <%= button_to card_collection_path(card, params: { collection_id: collection.id }), method: :patch,
                   class: "btn popup__item min-width flex-item-grow full-width unpad-inline",
                   form_class: "max-width flex-item-grow" do %>
diff --git a/app/views/cards/index/_collections_filter.html.erb b/app/views/cards/index/_collections_filter.html.erb
index ed2aff0ff..ce9b5079d 100644
--- a/app/views/cards/index/_collections_filter.html.erb
+++ b/app/views/cards/index/_collections_filter.html.erb
@@ -5,14 +5,14 @@
   <% end %>
 
   <% if Current.user.collections.one? %>
-    <%= link_to cards_path(filter.as_params.except(:collection_ids)), class: "popup__group flex align-center", data: { filter_text_value: filterable_name(Current.user.collections.first.name), filter_target: "item", navigable_list_target: "item" } do %>
+    <%= link_to cards_path(filter.as_params.except(:collection_ids)), class: "popup__group flex align-center", data: { filter_target: "item", navigable_list_target: "item" } do %>
       <%= tag.div class: "btn popup__item min-width flex-item-grow" do %>
         <span class="overflow-ellipsis"><%= Current.user.collections.first.name %></span>
         <span class="txt-ink translucent flex-item-no-shrink flex-item-justify-end"><span class="txt-x-small txt-uppercase">GO TO</span> ›</span>
       <% end %>
     <% end %>
   <% elsif Current.user.collections.many? %>
-    <%= link_to cards_path(filter.as_params.except(:collection_ids)), class: "popup__group flex align-center", data: { filter_text_value: "all collections", filter_target: "item", navigable_list_target: "item" } do %>
+    <%= link_to cards_path(filter.as_params.except(:collection_ids)), class: "popup__group flex align-center", data: { filter_target: "item", navigable_list_target: "item" } do %>
       <label class="btn txt-xx-small flex-item-no-shrink">
         <input type="checkbox" <%= "checked" if filter.collection_ids.empty? %>>
 
@@ -28,7 +28,7 @@
     <% end %>
 
     <% Current.user.collections.ordered_by_recently_accessed.each do |collection| %>
-      <li class="popup__group flex align-center" data-filter-text-value="<%= filterable_name(collection.name) %>" data-filter-target="item" data-navigable-list-target="item">
+      <li class="popup__group flex align-center" data-filter-target="item" data-navigable-list-target="item">
         <label class="btn txt-xx-small flex-item-no-shrink">
           <%= form.check_box "collection_ids[]", {
                 checked: filter.collections.include?(collection),
diff --git a/app/views/cards/show/_collections.html.erb b/app/views/cards/show/_collections.html.erb
index 83cc36ff4..9339a280d 100644
--- a/app/views/cards/show/_collections.html.erb
+++ b/app/views/cards/show/_collections.html.erb
@@ -2,14 +2,14 @@
 <%= form_with url: cards_path, method: :get, class: "popup__list",
       data: { controller: "form" } do |form| %>
   <% if Current.user.collections.one? %>
-    <%= link_to cards_path, class: "popup__group flex align-center", data: { filter_text_value: filterable_name(Current.user.collections.first.name), filter_target: "item", navigable_list_target: "item" } do %>
+    <%= link_to cards_path, class: "popup__group flex align-center", data: { filter_target: "item", navigable_list_target: "item" } do %>
       <%= tag.div class: "btn popup__item min-width flex-item-grow" do %>
         <span class="overflow-ellipsis"><%= Current.user.collections.first.name %></span>
         <span class="txt-ink translucent flex-item-no-shrink flex-item-justify-end"><span class="txt-x-small txt-uppercase">GO TO</span> ›</span>
       <% end %>
     <% end %>
   <% elsif Current.user.collections.many? %>
-    <%= link_to cards_path, class: "popup__group flex align-center", data: { filter_text_value: "all collections", filter_target: "item", navigable_list_target: "item" } do %>
+    <%= link_to cards_path, class: "popup__group flex align-center", data: { filter_target: "item", navigable_list_target: "item" } do %>
       <label class="btn txt-xx-small flex-item-no-shrink">
         <input type="checkbox">
 
@@ -25,7 +25,7 @@
     <% end %>
 
     <% Current.user.collections.ordered_by_recently_accessed.each do |collection| %>
-      <li class="popup__group flex align-center" data-filter-text-value="<%= filterable_name(collection.name) %>" data-filter-target="item" data-navigable-list-target="item">
+      <li class="popup__group flex align-center" data-filter-target="item" data-navigable-list-target="item">
         <label class="btn txt-xx-small flex-item-no-shrink">
           <%= form.check_box "collection_ids[]", {
                 checked: collection == @collection,
diff --git a/app/views/cards/taggings/new.html.erb b/app/views/cards/taggings/new.html.erb
index c8702d1c4..0a250007f 100644
--- a/app/views/cards/taggings/new.html.erb
+++ b/app/views/cards/taggings/new.html.erb
@@ -15,7 +15,7 @@
 
     <ul class="popup__list" data-filter-target="list">
       <% @tags.each do |tag| %>
-        <li class="popup__group flex align-center full-width" data-filter-text-value="<%= filterable_name(tag.hashtag) %>" data-filter-target="item" data-navigable-list-target="item">
+        <li class="popup__group flex align-center full-width" data-filter-target="item" data-navigable-list-target="item">
           <%= button_to card_taggings_path(@card, params: { tag_title: tag.title }), method: :post,
               class: "btn popup__item min-width flex-item-grow full-width unpad-inline",
               form_class: "max-width flex-item-grow" do %>
diff --git a/app/views/collections/_access_toggle.erb b/app/views/collections/_access_toggle.erb
index 2e3ef50d9..50687f42c 100644
--- a/app/views/collections/_access_toggle.erb
+++ b/app/views/collections/_access_toggle.erb
@@ -1,4 +1,4 @@
-<li class="flex align-center gap-half margin-none unpad txt-normal" data-filter-target="item" data-filter-text-value="<%= filterable_name(user.name) %>">
+<li class="flex align-center gap-half margin-none unpad txt-normal" data-filter-target="item">
   <%= avatar_tag user %>
 
   <div class="min-width">
diff --git a/app/views/events/filter/_all_collections_option.html.erb b/app/views/events/filter/_all_collections_option.html.erb
index 7bbd4b383..3046de66d 100644
--- a/app/views/events/filter/_all_collections_option.html.erb
+++ b/app/views/events/filter/_all_collections_option.html.erb
@@ -1,12 +1,12 @@
 <% if Current.user.collections.one? %>
-  <%= link_to cards_path(filter.as_params.except(:collection_ids)), class: "popup__group flex align-center", data: { filter_text_value: "all collections", filter_target: "item", navigable_list_target: "item" } do %>
+  <%= link_to cards_path(filter.as_params.except(:collection_ids)), class: "popup__group flex align-center", data: { filter_target: "item", navigable_list_target: "item" } do %>
     <%= tag.div class: "btn popup__item min-width flex-item-grow" do %>
       <span class="overflow-ellipsis"><%= Current.user.collections.first.name %></span>
       <span class="txt-ink translucent flex-item-no-shrink flex-item-justify-end"><span class="txt-x-small txt-uppercase">GO TO</span> ›</span>
     <% end %>
   <% end %>
 <% elsif Current.user.collections.many? %>
-  <div class="popup__group flex align-center" data-filter-text-value="all collections" data-filter-target="item" data-navigable-list-target="item">
+  <div class="popup__group flex align-center" data-filter-target="item" data-navigable-list-target="item">
     <%= link_to events_path(clear_filter: true), class: "btn txt-xx-small flex-item-no-shrink" do %>
       <%= check_box_tag "filter_collections", nil, filter.collections.blank?, class: "form-checkbox" %>
       <span class="for-screen-reader">
diff --git a/app/views/events/filter/_collection_option.html.erb b/app/views/events/filter/_collection_option.html.erb
index 3ee5cc796..44c584b13 100644
--- a/app/views/events/filter/_collection_option.html.erb
+++ b/app/views/events/filter/_collection_option.html.erb
@@ -1,4 +1,4 @@
-<li class="popup__group flex align-center" data-filter-text-value="<%= filterable_name(collection.name) %>" data-filter-target="item" data-navigable-list-target="item">
+<li class="popup__group flex align-center" data-filter-target="item" data-navigable-list-target="item">
   <label class="btn txt-xx-small">
     <%= form.check_box "collection_ids[]", {
           checked: filter.collections.include?(collection),
diff --git a/app/views/events/filter/_custom_collections.html.erb b/app/views/events/filter/_custom_collections.html.erb
index 888e7dc7b..9f543272d 100644
--- a/app/views/events/filter/_custom_collections.html.erb
+++ b/app/views/events/filter/_custom_collections.html.erb
@@ -1,5 +1,5 @@
 <strong class="popup__group-title">Saved filters</strong>
-<div class="popup__group flex align-center full-width gap-half overflow-ellipsis" data-navigable-list-target="item" data-filter-text-value="create a new filter" data-filter-target="item">
+<div class="popup__group flex align-center full-width gap-half overflow-ellipsis" data-navigable-list-target="item" data-filter-target="item">
   <%= link_to cards_path(expand_all: true), class: "btn popup__new popup__item" do %>
     <%= icon_tag "bookmark" %>
     <div class="flex flex-column txt-tight-lines min-width txt-small">
@@ -9,7 +9,7 @@
   <% end %>
 </div>
 <% @filters.each do |filter| %>
-  <div class="popup__group flex align-center full-width gap-half overflow-ellipsis" data-filter-text-value="<%= filterable_name(filter.summary) %>" data-filter-target="item" data-navigable-list-target="item">
+  <div class="popup__group flex align-center full-width gap-half overflow-ellipsis" data-filter-target="item" data-navigable-list-target="item">
     <%= link_to cards_path(filter_id: filter.id), class: "btn popup__new popup__item" do %>
       <%= icon_tag "bookmark" %>
       <div class="flex flex-column txt-tight-lines min-width txt-small">
diff --git a/app/views/events/filter/_header.html.erb b/app/views/events/filter/_header.html.erb
index 823a4497f..9066fff77 100644
--- a/app/views/events/filter/_header.html.erb
+++ b/app/views/events/filter/_header.html.erb
@@ -1,35 +1,35 @@
 <div class="flex flex-wrap align-center justify-center full-width max-width fizzy-menu__hotkeys">
-  <%= link_to root_path, class: "btn popup__group borderless", data: { filter_text_value: "home", filter_target: "item", navigable_list_target: "item", controller: "hotkey", action: "keydown.1@document->hotkey#click keydown.shift+1@document->hotkey#click" } do %>
+  <%= link_to root_path, class: "btn popup__group borderless", data: { filter_target: "item", navigable_list_target: "item", controller: "hotkey", action: "keydown.1@document->hotkey#click keydown.shift+1@document->hotkey#click" } do %>
     <%= icon_tag "home" %>
     <span>Home</span>
     <kbd>1</kbd>
   <% end %>
 
-  <%= link_to cards_path(assignee_ids: [Current.user.id]), class: "btn popup__group borderless", data: {  filter_text_value: "assigned to me", filter_target: "item", navigable_list_target: "item", controller: "hotkey", action: "keydown.2@document->hotkey#click keydown.shift+2@document->hotkey#click" } do %>
+  <%= link_to cards_path(assignee_ids: [Current.user.id]), class: "btn popup__group borderless", data: { filter_target: "item", navigable_list_target: "item", controller: "hotkey", action: "keydown.2@document->hotkey#click keydown.shift+2@document->hotkey#click" } do %>
     <%= icon_tag "clipboard" %>
     <span>Assigned to me</span>
     <kbd>2</kbd>
   <% end %>
 
-  <%= link_to cards_path(creator_ids: [Current.user.id]), class: "btn popup__group borderless", data: {  filter_text_value: "added by me", filter_target: "item", navigable_list_target: "item", controller: "hotkey", action: "keydown.3@document->hotkey#click keydown.shift+3@document->hotkey#click" } do %>
+  <%= link_to cards_path(creator_ids: [Current.user.id]), class: "btn popup__group borderless", data: { filter_target: "item", navigable_list_target: "item", controller: "hotkey", action: "keydown.3@document->hotkey#click keydown.shift+3@document->hotkey#click" } do %>
     <%= icon_tag "person-add" %>
     <span>Added by me</span>
     <kbd>3</kbd>
   <% end %>
 
-  <%= link_to new_collection_path, class: "btn popup__group borderless", data: {  filter_text_value: "new collection", filter_target: "item", navigable_list_target: "item", controller: "hotkey", action: "keydown.4@document->hotkey#click keydown.shift+4@document->hotkey#click" } do %>
+  <%= link_to new_collection_path, class: "btn popup__group borderless", data: { filter_target: "item", navigable_list_target: "item", controller: "hotkey", action: "keydown.4@document->hotkey#click keydown.shift+4@document->hotkey#click" } do %>
     <%= icon_tag "collection-add" %>
     <span>New Collection</span>
     <kbd>4</kbd>
   <% end %>
 
-  <%= link_to notifications_path, class: "btn popup__group borderless", data: {  filter_text_value: "notifications", filter_target: "item", navigable_list_target: "item", controller: "hotkey", action: "keydown.5@document->hotkey#click keydown.shift+5@document->hotkey#click" } do %>
+  <%= link_to notifications_path, class: "btn popup__group borderless", data: { filter_target: "item", navigable_list_target: "item", controller: "hotkey", action: "keydown.5@document->hotkey#click keydown.shift+5@document->hotkey#click" } do %>
     <%= icon_tag "bell" %>
     <span>Notifications</span>
     <kbd>5</kbd>
   <% end %>
 
-  <%= link_to account_settings_path, class: "btn popup__group borderless", data: {  filter_text_value: "account settings", filter_target: "item", navigable_list_target: "item", controller: "hotkey", action: "keydown.6@document->hotkey#click keydown.shift+6@document->hotkey#click" } do %>
+  <%= link_to account_settings_path, class: "btn popup__group borderless", data: { filter_target: "item", navigable_list_target: "item", controller: "hotkey", action: "keydown.6@document->hotkey#click keydown.shift+6@document->hotkey#click" } do %>
     <%= icon_tag "settings" %>
     <span>Settings</span>
     <kbd>6</kbd>
diff --git a/app/views/events/filter/_tag.html.erb b/app/views/events/filter/_tag.html.erb
index 8dcc3565d..551ca026f 100644
--- a/app/views/events/filter/_tag.html.erb
+++ b/app/views/events/filter/_tag.html.erb
@@ -1,4 +1,4 @@
-<li class="popup__group flex align-center" data-filter-text-value="<%= filterable_name(tag.title) %>" data-filter-target="item" data-navigable-list-target="item">
+<li class="popup__group flex align-center" data-filter-target="item" data-navigable-list-target="item">
   <%= icon_tag "tag" %>
   <%= link_to cards_path(tag_ids: [ tag ]), class: "btn popup__item min-width flex-item-grow" do %>
     <span class="overflow-ellipsis"><%= tag.title %></span>
diff --git a/app/views/events/filter/_user.html.erb b/app/views/events/filter/_user.html.erb
index a31c3afd2..0a19c3f93 100644
--- a/app/views/events/filter/_user.html.erb
+++ b/app/views/events/filter/_user.html.erb
@@ -1,4 +1,4 @@
-<li class="popup__group flex align-center" data-filter-text-value="<%= filterable_name(user.name) %>" data-filter-target="item" data-navigable-list-target="item">
+<li class="popup__group flex align-center" data-filter-target="item" data-navigable-list-target="item">
   <%= icon_tag "person" %>
   <%= link_to user, class: "btn popup__item min-width flex-item-grow" do %>
     <span class="overflow-ellipsis"><%= user.name %></span>
diff --git a/app/views/filters/_assignees.html.erb b/app/views/filters/_assignees.html.erb
index 781fce320..9eaeb6f5d 100644
--- a/app/views/filters/_assignees.html.erb
+++ b/app/views/filters/_assignees.html.erb
@@ -27,7 +27,7 @@
       <% end %>
 
       <ul class="popup__list" data-filter-target="list">
-        <li class="popup__group flex align-center" data-filter-text-value="no one" data-filter-target="item" data-navigable-list-target="item">
+        <li class="popup__group flex align-center" data-filter-target="item" data-navigable-list-target="item">
           <%= form_with url: cards_path, method: :get, class: "full-width", data: { controller: "form" } do |form| %>
             <% filter.as_params.except(:assignee_ids, :assignment_status).each do |key, value| %>
               <%= filter_hidden_field_tag key, value %>
@@ -50,7 +50,7 @@
           <% end %>
         </li>
         <% User.active.order(:name).each do |user| %>
-          <li class="popup__group flex align-center" data-filter-text-value="<%= filterable_name(user.name.downcase) %>" data-filter-target="item" data-navigable-list-target="item">
+          <li class="popup__group flex align-center" data-filter-target="item" data-navigable-list-target="item">
             <%= form_with url: cards_path, method: :get, class: "full-width", data: { controller: "form" } do |form| %>
               <% filter.as_params.except(:assignee_ids, :assignment_status).each do |key, value| %>
                 <%= filter_hidden_field_tag key, value %>
diff --git a/app/views/filters/_creators.html.erb b/app/views/filters/_creators.html.erb
index c879fac92..609344c3d 100644
--- a/app/views/filters/_creators.html.erb
+++ b/app/views/filters/_creators.html.erb
@@ -27,7 +27,7 @@
 
       <ul class="popup__list" data-filter-target="list">
         <% User.active.order(:name).each do |user| %>
-          <li class="popup__group flex align-center" data-filter-text-value="<%= filterable_name(user.name.downcase) %>" data-filter-target="item" data-navigable-list-target="item">
+          <li class="popup__group flex align-center" data-filter-target="item" data-navigable-list-target="item">
             <%= form_with url: cards_path, method: :get, class: "full-width", data: { controller: "form" } do |form| %>
               <% filter.as_params.except(:creator_ids).each do |key, value| %>
                 <%= filter_hidden_field_tag key, value %>
diff --git a/app/views/filters/_tags.html.erb b/app/views/filters/_tags.html.erb
index 637f88be3..e3e73e528 100644
--- a/app/views/filters/_tags.html.erb
+++ b/app/views/filters/_tags.html.erb
@@ -26,7 +26,7 @@
       
       <ul class="popup__list" data-filter-target="list">
         <% Tag.order(:title).each do |tag| %>
-          <li class="popup__group flex align-center" data-filter-text-value="<%= filterable_name(tag.title.downcase) %>" data-filter-target="item" data-navigable-list-target="item">
+          <li class="popup__group flex align-center" data-filter-target="item" data-navigable-list-target="item">
             <%= form_with url: cards_path, method: :get, class: "full-width", data: { controller: "form" } do |form| %>
               <% filter.as_params.except(:tag_ids).each do |key, value| %>
                 <%= filter_hidden_field_tag key, value %>