diff --git a/resources/public/js/scripts.js b/resources/public/js/scripts.js
index aaeeb55..12e2d24 100644
--- a/resources/public/js/scripts.js
+++ b/resources/public/js/scripts.js
@@ -237,7 +237,6 @@ document.addEventListener('DOMContentLoaded', function () {
 
         function onSort(ctx, ix, event) {
             const tbl = ctx.tbl
-            console.debug(tbl, ix, event)
 
             const sortDir = event.target.getAttribute('data-sort') || 'asc'
             const sortMod = sortDir === 'asc' ? -1 : 1;
diff --git a/src/wanijo/instance/view.clj b/src/wanijo/instance/view.clj
index 9daa683..3b19680 100644
--- a/src/wanijo/instance/view.clj
+++ b/src/wanijo/instance/view.clj
@@ -39,9 +39,9 @@
       (for [instance instances]
         [:tr
          [:td
-          (tags-for-search instance)
           [:a {:href (path :instance-show instance)}
-           (h (:name instance))]]
+           (h (:name instance))]
+          (tags-for-search instance)]
          [:td (prettify-dt (:updated_at instance))]
          [:td (prettify-dt (:created_at instance))]])]]]))
 
@@ -134,8 +134,8 @@
                      name (if empty [:i "empty"] (h name))]]
            [:tr
             [:td
-             (tags-for-search row)
-             name]
+             name
+             (tags-for-search row)]
             [:td [:a {:href (path :instance-show target)}
                   (h (:name target))]]
             [:td [:a {:href (path :instance-list
@@ -159,8 +159,8 @@
                      name (if empty [:i "empty"] (h name))]]
            [:tr
             [:td
-             (tags-for-search row)
-             name]
+             name
+             (tags-for-search row)]
             [:td [:a {:href (path :instance-show source)}
                   (h (:name source))]]
             [:td [:a {:href (path :instance-list