diff --git a/src/clj/auto_ap/ssr/grid_page_helper.clj b/src/clj/auto_ap/ssr/grid_page_helper.clj
index def70ad0..506be5f0 100644
--- a/src/clj/auto_ap/ssr/grid_page_helper.clj
+++ b/src/clj/auto_ap/ssr/grid_page_helper.clj
@@ -208,6 +208,7 @@
 
 (defn table-route [grid-spec]
   (-> (fn table [{:keys [identity] :as request}]
+        (alog/peek ::TABLE-QP (:parsed-query-params request))
         (let [unparse-query-params (or (:unparse-query grid-spec)
                                        default-unparse-query-params)]
           (html-response (table*
@@ -224,10 +225,10 @@
                                                                                                                          main-transformer))
                                                                                                   "sort" sort->query)))
                                                                        (update (filter-vals #(not (nil? %))
-                                                                                                     (m/encode (:query-schema grid-spec)
-                                                                                                               (:query-params request)
-                                                                                                               main-transformer))
-                                                                                        "sort" sort->query))
+                                                                                            (m/encode (:query-schema grid-spec)
+                                                                                                      (:query-params request)
+                                                                                                      main-transformer))
+                                                                               "sort" sort->query))
                                                                      (unparse-query-params (:parsed-query-params request)))
                                                                    "selected" "all-selected")))} ;; TODO seems hacky to special case selected and all-selected here
                          :oob (when-let [oob-render (:oob-render grid-spec)]
diff --git a/src/clj/auto_ap/ssr/invoices.clj b/src/clj/auto_ap/ssr/invoices.clj
index 4700254a..16b499ad 100644
--- a/src/clj/auto_ap/ssr/invoices.clj
+++ b/src/clj/auto_ap/ssr/invoices.clj
@@ -390,7 +390,8 @@
                     (assoc-in (exact-match-id* request)  [1 :hx-swap-oob] true)])
                  :query-schema query-schema
                  :parse-query-params (fn [p]
-                                       (mc/decode query-schema p main-transformer))
+                                       (alog/peek ::PARSE
+                                                  (mc/decode query-schema p main-transformer)))
                  :action-buttons (fn [request]
                                    [(when (can? (:identity request) {:subject :invoice :activity :bulk-delete})
                                       (com/button {:hx-get    (str (bidi/path-for ssr-routes/only-routes ::route/bulk-delete))
@@ -1216,6 +1217,7 @@
      (-> h
          (wrap-status-from-source)
          (wrap-apply-sort grid-page)
-         (wrap-schema-enforce :query-schema query-schema)
          (wrap-merge-prior-hx)
+         (wrap-schema-enforce :query-schema query-schema)
+         (wrap-schema-enforce :hx-schema query-schema)
          (wrap-client-redirect-unauthenticated)))))
\ No newline at end of file