diff --git a/padelnomics/src/padelnomics/directory/routes.py b/padelnomics/src/padelnomics/directory/routes.py
index d3527fd..2d180ae 100644
--- a/padelnomics/src/padelnomics/directory/routes.py
+++ b/padelnomics/src/padelnomics/directory/routes.py
@@ -89,7 +89,7 @@ async def _build_directory_query(q, country, category, region, page, per_page=24
 
     offset = (page - 1) * per_page
     # Tier-based ordering: sticky first, then pro > growth > free, then name
-    order_params = [now, country or ""] + params + [per_page, offset]
+    order_params = params + [now, country or "", per_page, offset]
     suppliers = await fetch_all(
         f"""SELECT * FROM suppliers s WHERE {where}
         ORDER BY
diff --git a/padelnomics/src/padelnomics/directory/templates/directory.html b/padelnomics/src/padelnomics/directory/templates/directory.html
index 3f4f20a..b7693b9 100644
--- a/padelnomics/src/padelnomics/directory/templates/directory.html
+++ b/padelnomics/src/padelnomics/directory/templates/directory.html
@@ -158,28 +158,27 @@
   </div>
 
   <!-- Search + Filters -->
-  <form method="get" class="dir-search">
+  <form method="get" class="dir-search" id="dir-search-form">
     <input type="search" name="q" value="{{ q }}" placeholder="Search suppliers, countries, products..."
-           class="dir-search"
            hx-get="{{ url_for('directory.results') }}"
            hx-trigger="input changed delay:300ms"
            hx-target="#dir-results"
-           hx-include=".dir-search">
-    <select name="country" class="dir-search"
+           hx-include="#dir-search-form">
+    <select name="country"
             hx-get="{{ url_for('directory.results') }}"
             hx-trigger="change"
             hx-target="#dir-results"
-            hx-include=".dir-search">
+            hx-include="#dir-search-form">
       <option value="">All Countries</option>
       {% for cc in country_counts %}
       <option value="{{ cc.country_code }}" {{ 'selected' if country == cc.country_code }}>{{ country_labels.get(cc.country_code, cc.country_code) }} ({{ cc.cnt }})</option>
       {% endfor %}
     </select>
-    <select name="category" class="dir-search"
+    <select name="category"
             hx-get="{{ url_for('directory.results') }}"
             hx-trigger="change"
             hx-target="#dir-results"
-            hx-include=".dir-search">
+            hx-include="#dir-search-form">
       <option value="">All Categories</option>
       {% for cat in category_counts %}
       <option value="{{ cat.category }}" {{ 'selected' if category == cat.category }}>{{ category_labels.get(cat.category, cat.category) }} ({{ cat.cnt }})</option>