diff --git a/templates/media_list.pages.tmpl b/templates/media_list.pages.tmpl
index 31a2fd0..d6dde87 100644
--- a/templates/media_list.pages.tmpl
+++ b/templates/media_list.pages.tmpl
@@ -1,10 +1,5 @@
-<section class="section"
-         hx-on="htmx:request:document.getElementById('loading-spinner').style.display = 'block'; htmx:afterRequest:document.getElementById('loading-spinner').style.display = 'none'">
+<section class="section">
   <div class="container">
-    <!-- Spinner -->
-    <div id="loading-spinner" class="has-text-centered" style="display:none;">
-      <button class="button is-loading is-white is-large" aria-label="Loading"></button>
-    </div>
 
     <!-- Breadcrumb -->
     <nav class="breadcrumb" aria-label="breadcrumbs">
@@ -12,7 +7,9 @@
         {{if .CurrentSub}}
         <li>
           <a hx-get="/api/paths/{{.PathID}}/media"
-             hx-target="#content" hx-swap="innerHTML">
+             hx-push-url="/api/paths/{{.PathID}}/media"
+             hx-target="#content"
+             hx-swap="innerHTML">
             🔙 Racine
           </a>
         </li>
@@ -28,12 +25,10 @@
       <div class="column is-one-quarter">
         <div class="card">
           <div class="card-content has-text-centered">
-                <a
-                hx-get="/media/{{.MediaPartID}}?path={{.FilePath | urlquery}}&pathID={{$.PathID}}&sub={{$.CurrentSub}}"
-                hx-push-url="/media/{{.MediaPartID}}?path={{.FilePath | urlquery}}&pathID={{$.PathID}}&sub={{$.CurrentSub}}"
-                hx-target="#content"
-                hx-swap="innerHTML"
-                >
+            <a hx-get="/api/paths/{{$.PathID}}/media?sub={{.SubPath | urlquery}}"
+               hx-push-url="/api/paths/{{$.PathID}}/media?sub={{.SubPath | urlquery}}"
+               hx-target="#content"
+               hx-swap="innerHTML">
               <span class="icon is-large">
                 <i class="fas fa-folder fa-2x"></i>
               </span>
@@ -54,19 +49,21 @@
         <div class="card">
           <div class="card-image">
             <figure class="image is-4by3">
-              <a hx-get="/media/{{.MediaPartID}}?path={{.FilePath | urlquery}}"
-                 hx-target="#content" hx-swap="innerHTML">
+              <a hx-get="/media/{{.MediaPartID}}?path={{.FilePath | urlquery}}&pathID={{$.PathID}}&sub={{$.CurrentSub | urlquery}}"
+                 hx-push-url="/media/{{.MediaPartID}}?path={{.FilePath | urlquery}}&pathID={{$.PathID}}&sub={{$.CurrentSub | urlquery}}"
+                 hx-target="#content"
+                 hx-swap="innerHTML">
                 <img src="{{.ThumbURL}}" alt="{{.Title}}">
               </a>
             </figure>
           </div>
           <div class="card-content">
-            <a hx-get="/media/{{.MediaPartID}}?path={{.FilePath | urlquery}}"
-               hx-target="#content" hx-swap="innerHTML">
+            <a hx-get="/media/{{.MediaPartID}}?path={{.FilePath | urlquery}}&pathID={{$.PathID}}&sub={{$.CurrentSub | urlquery}}"
+               hx-push-url="/media/{{.MediaPartID}}?path={{.FilePath | urlquery}}&pathID={{$.PathID}}&sub={{$.CurrentSub | urlquery}}"
+               hx-target="#content"
+               hx-swap="innerHTML">
               <p class="title is-6 is-clipped">{{.Title}}</p>
-              {{if .DurationFmt}}
-              <p class="subtitle is-7">{{.DurationFmt}}</p>
-              {{end}}
+              {{if .DurationFmt}}<p class="subtitle is-7">{{.DurationFmt}}</p>{{end}}
             </a>
           </div>
         </div>
@@ -81,5 +78,6 @@
       Aucun dossier ni média dans ce répertoire.
     </div>
     {{end}}{{end}}
+
   </div>
 </section>