diff --git a/src/clj/auto_ap/ssr/transaction/edit.clj b/src/clj/auto_ap/ssr/transaction/edit.clj
index e66abe69..450f53ce 100644
--- a/src/clj/auto_ap/ssr/transaction/edit.clj
+++ b/src/clj/auto_ap/ssr/transaction/edit.clj
@@ -230,7 +230,7 @@
                :x-dispatch:changed "simpleAccountId"
                :hx-trigger "changed"
                :hx-get (bidi/path-for ssr-routes/only-routes ::route/location-select)
-               :hx-target "find *"
+               :hx-target "find select"
                :hx-swap "outerHTML"}
               (location-select*
                {:name (fc/field-name)
@@ -287,7 +287,7 @@
         :x-dispatch:changed "accountId"
         :hx-trigger "changed"
         :hx-get (bidi/path-for ssr-routes/only-routes ::route/location-select)
-        :hx-target "find *"
+        :hx-target "find select"
         :hx-swap "outerHTML"}
        (location-select* {:name (fc/field-name)
                           :account-location (:account/location (cond->> (:transaction-account/account @value)
@@ -1466,7 +1466,7 @@
               (let [new-account (cond-> {:db/id (str (java.util.UUID/randomUUID))
                                          :transaction-account/location (or (:account/location default-account) "Shared")
                                          :transaction-account/amount (if (= amount-mode "%") 100.0 total)}
-                                   default-account (assoc :transaction-account/account (:db/id default-account)))]
+                                  default-account (assoc :transaction-account/account (:db/id default-account)))]
                 (-> request
                     (assoc-in [:multi-form-state :snapshot :transaction/accounts] [new-account])
                     (assoc-in [:multi-form-state :step-params :transaction/accounts] [new-account])))
@@ -1480,7 +1480,9 @@
 (defn edit-wizard-toggle-mode-handler [request]
   (let [step-params (-> request :multi-form-state :step-params)
         snapshot (-> request :multi-form-state :snapshot)
-        current-mode (keyword (or (:mode step-params) "simple"))
+        current-mode (keyword (or (:mode step-params)
+                                  (get (:form-params request) "mode")
+                                  "simple"))
         target-mode (if (= current-mode :simple) :advanced :simple)
         ;; When switching simple→advanced, promote simple-mode values into accounts
         render-request