diff --git a/core/templates/partials/rule-list.html b/core/templates/partials/rule-list.html
index 3bbe9c7..4d147fd 100644
--- a/core/templates/partials/rule-list.html
+++ b/core/templates/partials/rule-list.html
@@ -22,7 +22,7 @@
   </thead>
   {% for item in object_list %}
     <tr>
-      <td><a href="/search/?rule={{ item.id }}&query=*&source=all">{{ item.id }}</a></td>
+      <td><a href="/?query=*&source=all&rule={{ item.id }}">{{ item.id }}</a></td>
       <td>{{ item.user }}</td>
       <td>{{ item.name }}</td>
       <td>{{ item.interval }}s</td>
diff --git a/core/views/ui/drilldown.py b/core/views/ui/drilldown.py
index 61b69ed..5c12dd3 100644
--- a/core/views/ui/drilldown.py
+++ b/core/views/ui/drilldown.py
@@ -209,9 +209,9 @@ class DrilldownTableView(SingleTableView):
             # Still push the URL so they can share it to get assistance
             if request.GET:
                 if request.htmx:
-                    response["HX-Push"] = reverse("home") + "?" + url_params
+                    response["HX-Replace"] = reverse("home") + "?" + url_params
             elif request.POST:
-                response["HX-Push"] = reverse("home") + "?" + url_params
+                response["HX-Replace"] = reverse("home") + "?" + url_params
             return response
 
         # Create data for chart.js sentiment graph
@@ -265,7 +265,7 @@ class DrilldownTableView(SingleTableView):
         response = self.render_to_response(context)
         # if not request.method == "GET":
         if "client_uri" in context:
-            response["HX-Push"] = reverse("home") + "?" + context["client_uri"]
+            response["HX-Replace"] = reverse("home") + "?" + context["client_uri"]
         return response
 
     def post(self, request, *args, **kwargs):