diff --git a/shared b/shared
index 5518c95..cf2e2ba 160000
--- a/shared
+++ b/shared
@@ -1 +1 @@
-Subproject commit 5518c9523729e5c1f6cdb8dd1892ded8d0ed8c71
+Subproject commit cf2e2ba1db3011f686de7b8f11dfaa7d928c0d1e
diff --git a/templates/_types/browse/desktop/_filter/search.html b/templates/_types/browse/desktop/_filter/search.html
deleted file mode 100644
index 2e0ea8e..0000000
--- a/templates/_types/browse/desktop/_filter/search.html
+++ /dev/null
@@ -1,44 +0,0 @@
-
-{% macro search(current_local_href,search, search_count, hx_select) -%}
-<!-- Search (1/3 width → 4/12 columns) -->
-  <!-- nb this does NOT oob itself!! -->
-   <div
-      id="search-desktop-wrapper"
-      class="flex flex-row gap-2 items-center"
-    >
-    <input
-      id="search-desktop"
-      type="text"
-      name="search"
-      aria-label="search"
-      class="w-full mx-1 my-3 px-3 py-2 text-md rounded-xl border-2 shadow-sm border-white placeholder-shown:border-white [&:not(:placeholder-shown)]:border-yellow-200"
-      hx-preserve
-      value="{{ search|default('', true) }}"
-      placeholder="search"
-      hx-trigger="input changed delay:300ms"
-      hx-target="#main-panel"
-            
-      hx-select="{{hx_select}}, #search-mobile-wrapper, #search-desktop-wrapper"
-      hx-get="{{ (current_local_href ~ {'search': None}|qs)|host}}"
-      hx-swap="outerHTML"
-      hx-push-url="true"
-      hx-headers='{"X-Origin":"search-desktop", "X-Search":"true"}'
-      hx-sync="this:replace"
-        
-      autocomplete="off"
-    >
-
-    <div
-        id="search-count-desktop"
-        aria-label="search count"
-        {% if not search_count %}
-          class="text-xl text-red-500"
-        {% endif %}
-      >
-        {% if search %}
-          {{search_count}}
-        {% endif %}
-        {{zap_filter}}
-      </div>
-  </div>
-{% endmacro %}
\ No newline at end of file
diff --git a/templates/_types/orders/_oob_elements.html b/templates/_types/orders/_oob_elements.html
index ab50cb1..741e8fa 100644
--- a/templates/_types/orders/_oob_elements.html
+++ b/templates/_types/orders/_oob_elements.html
@@ -18,8 +18,8 @@
 {% endblock %}
 
 {% block aside %}
-  {% import '_types/browse/desktop/_filter/search.html' as s %}
-  {{ s.search(current_local_href, search, search_count, hx_select) }}
+  {% from 'macros/search.html' import search_desktop %}
+  {{ search_desktop(current_local_href, search, search_count, hx_select) }}
 {% endblock %}
 
 {% block filter %}
diff --git a/templates/_types/orders/_summary.html b/templates/_types/orders/_summary.html
index 824a235..f812413 100644
--- a/templates/_types/orders/_summary.html
+++ b/templates/_types/orders/_summary.html
@@ -5,7 +5,7 @@
       </p>
     </div>
     <div class="md:hidden">
-      {% import '_types/browse/mobile/_filter/search.html' as s %}
-      {{ s.search(current_local_href, search, search_count, hx_select) }}
+      {% from 'macros/search.html' import search_mobile %}
+      {{ search_mobile(current_local_href, search, search_count, hx_select) }}
     </div>
   </header>
\ No newline at end of file
diff --git a/templates/_types/orders/index.html b/templates/_types/orders/index.html
index 8744c13..7ee80a0 100644
--- a/templates/_types/orders/index.html
+++ b/templates/_types/orders/index.html
@@ -15,8 +15,8 @@
 {% endblock %}
 
 {% block aside %}
-  {% import '_types/browse/desktop/_filter/search.html' as s %}
-  {{ s.search(current_local_href, search, search_count, hx_select) }}
+  {% from 'macros/search.html' import search_desktop %}
+  {{ search_desktop(current_local_href, search, search_count, hx_select) }}
 {% endblock %}