diff --git a/web/static/css/main.css b/web/static/css/main.css
index dd73e36..831cc5c 100644
--- a/web/static/css/main.css
+++ b/web/static/css/main.css
@@ -1088,6 +1088,9 @@ select {
 #magacin-rezultati.bez-anim .tabela tbody tr,
 #magacin-rezultati.bez-anim .animiraj { animation: none; }
 
+#klijenti-rezultati.bez-anim .tabela tbody tr,
+#klijenti-rezultati.bez-anim .animiraj { animation: none; }
+
 /* korisnikova preferencija animacije: body[data-animacija] nadjačava podrazumevano.
    Kad korisnik odabere stil, animiraju se i redovi tabela i mobilne kartice. */
 [data-animacija="bez"] .animiraj,
diff --git a/web/templates/stranice/klijenti.html b/web/templates/stranice/klijenti.html
index e8acd05..ee1b09c 100644
--- a/web/templates/stranice/klijenti.html
+++ b/web/templates/stranice/klijenti.html
@@ -21,10 +21,7 @@
                 placeholder="Pretraži po imenu ili nazivu firme..."
                 style="flex:1;"
                 hx-trigger="keyup changed delay:300ms, search"
-                hx-get="/klijenti" hx-target="#klijenti-rezultati" hx-select="#klijenti-rezultati" hx-swap="innerHTML" hx-push-url="true">
-            <button type="submit" class="btn-primarno">
-                Traži
-            </button>
+                hx-get="/klijenti" hx-include="[name='tip']:checked" hx-target="#klijenti-rezultati" hx-select="#klijenti-rezultati" hx-swap="innerHTML" hx-push-url="true">
         </form>
     </div>
 
@@ -34,17 +31,17 @@
     <div style="display:flex;gap:16px;margin-bottom:12px;flex-wrap:wrap;align-items:center;">
         <label style="display:inline-flex;align-items:center;gap:6px;cursor:pointer;font-size:14px;">
             <input type="radio" name="tip" value="" {{if eq .TipFilter ""}}checked{{end}}
-                hx-trigger="change" hx-get="/klijenti?pretraga={{.Pretraga}}"
+                hx-trigger="change" hx-get="/klijenti" hx-include="[name='pretraga']"
                 hx-target="#klijenti-rezultati" hx-select="#klijenti-rezultati" hx-swap="innerHTML" hx-push-url="true"> Svi
         </label>
         <label style="display:inline-flex;align-items:center;gap:6px;cursor:pointer;font-size:14px;">
             <input type="radio" name="tip" value="pravno" {{if eq .TipFilter "pravno"}}checked{{end}}
-                hx-trigger="change" hx-get="/klijenti?pretraga={{.Pretraga}}&tip=pravno"
+                hx-trigger="change" hx-get="/klijenti" hx-include="[name='pretraga']"
                 hx-target="#klijenti-rezultati" hx-select="#klijenti-rezultati" hx-swap="innerHTML" hx-push-url="true"> Firme
         </label>
         <label style="display:inline-flex;align-items:center;gap:6px;cursor:pointer;font-size:14px;">
             <input type="radio" name="tip" value="fizicko" {{if eq .TipFilter "fizicko"}}checked{{end}}
-                hx-trigger="change" hx-get="/klijenti?pretraga={{.Pretraga}}&tip=fizicko"
+                hx-trigger="change" hx-get="/klijenti" hx-include="[name='pretraga']"
                 hx-target="#klijenti-rezultati" hx-select="#klijenti-rezultati" hx-swap="innerHTML" hx-push-url="true"> Fizička lica
         </label>
     </div>
@@ -182,4 +179,15 @@
     </div><!-- kraj #klijenti-rezultati -->
 
 </div>
+
+<script>
+// Gasi animaciju redova pri pretrazi i promeni tipa (ali NE pri paginaciji).
+document.body.addEventListener('htmx:beforeRequest', function (e) {
+    var elt = e.detail && e.detail.elt;
+    if (elt && (elt.name === 'pretraga' || elt.name === 'tip')) {
+        var rez = document.getElementById('klijenti-rezultati');
+        if (rez) rez.classList.add('bez-anim');
+    }
+});
+</script>
 {{end}}
diff --git a/web/templates/stranice/magacin.html b/web/templates/stranice/magacin.html
index 67943f8..543e73b 100644
--- a/web/templates/stranice/magacin.html
+++ b/web/templates/stranice/magacin.html
@@ -40,8 +40,8 @@
         <input type="text" name="pretraga" value="{{.Filter.Pretraga}}"
             placeholder="Pretraži po nazivu, šifri, barkodu, lokaciji..."
             style="width:100%;"
-            hx-trigger="keyup changed delay:300ms, search"
-            hx-get="/magacin" hx-target="#magacin-rezultati" hx-select="#magacin-rezultati" hx-swap="innerHTML" hx-push-url="true">
+            hx-trigger="keyup[target.value.length==0||target.value.length>=3] changed delay:150ms, search"
+            hx-get="/magacin" hx-include="closest form" hx-target="#magacin-rezultati" hx-select="#magacin-rezultati" hx-swap="innerHTML" hx-push-url="true">
         <div style="display:flex;gap:10px;flex-wrap:wrap;align-items:center;">
             <select name="kategorija" style="flex:1;min-width:140px;"
                 hx-trigger="change"
@@ -63,9 +63,6 @@
                     hx-get="/magacin" hx-target="#magacin-rezultati" hx-select="#magacin-rezultati" hx-swap="innerHTML" hx-push-url="true">
                 Arhivirani
             </label>
-            <button type="submit" class="btn-primarno">
-                Traži
-            </button>
         </div>
     </form>