diff --git a/src/clj/auto_ap/ssr/admin/transaction_rules.clj b/src/clj/auto_ap/ssr/admin/transaction_rules.clj
index b936075d..ff000622 100644
--- a/src/clj/auto_ap/ssr/admin/transaction_rules.clj
+++ b/src/clj/auto_ap/ssr/admin/transaction_rules.clj
@@ -321,6 +321,7 @@
                                    only-uncoded? :only-uncoded?}]
   (let [valid-clients (extract-client-ids clients
                                           client)
+        bank-account (or (:db/id bank-account) bank-account)
 
         query (cond-> {:query {:find ['(pull ?e read)]
                                :in ['$ 'read]
@@ -495,7 +496,7 @@
               {:errors (fc/field-errors)}
               [:div {:hx-trigger "changed"
                      :hx-target  "next div"
-                     :hx-vals    (format "js:{name: '%s', 'client-id': event.detail.clientId, value: event.detail.accountId}" account-name)
+                     :hx-vals    (format "js:{name: '%s', 'client-id': event.detail.clientId, value: event.detail.accountId || ''}" account-name)
                      :hx-get     (str (bidi/path-for ssr-routes/only-routes ::route/account-typeahead))
                      :x-init     "$watch('clientId', cid => $dispatch('changed', $data));"}]
               (account-typeahead* {:value     (fc/field-value)
@@ -511,7 +512,7 @@
               [:div {:hx-trigger "changed"
                      :hx-target  "next *"
                      :hx-swap "outerHTML"
-                     :hx-vals    (format "js:{name: '%s', 'client-id': event.detail.clientId || '', 'account-id': event.detail.accountId || '', value: event.detail.location}" (fc/field-name) )
+                     :hx-vals    (format "js:{name: '%s', 'client-id': event.detail.clientId || '', 'account-id': event.detail.accountId || '', value: event.detail.location || ''}" (fc/field-name) )
                      :hx-get     (bidi/path-for ssr-routes/only-routes ::route/location-select)
                      :x-init     "$watch('clientId', cid => $dispatch('changed', $data)); $watch('accountId', cid =>  $dispatch('changed', $data) )"}]
               (location-select* {:name             (fc/field-name)
@@ -686,7 +687,7 @@
                                                         :hx-get    (bidi/path-for ssr-routes/only-routes
                                                                                   ::route/new-account)
                                                         :index     (count (fc/field-value))
-                                                        :tr-params (hx/bind-alpine-vals {} {:client-id "clientId"})}
+                                                        :tr-params (hx/bind-alpine-vals {} {"client-id" "clientId"})}
                                                        "New account")))))
 
            (fc/with-field :transaction-rule/transaction-approval-status
@@ -722,7 +723,7 @@
       (transaction-rule-account-row*
         fc/*current*
         client-id
-        (some->> client-id (pull-attr (dc/db conn) :client/locations) client-id)))))
+        (some->> client-id (pull-attr (dc/db conn) :client/locations))))))
 
 (defn all-ids-not-locked [all-ids]
   (->> all-ids
diff --git a/src/clj/auto_ap/ssr/vendor.clj b/src/clj/auto_ap/ssr/vendor.clj
index 01b0a544..3aaa8c41 100644
--- a/src/clj/auto_ap/ssr/vendor.clj
+++ b/src/clj/auto_ap/ssr/vendor.clj
@@ -9,21 +9,15 @@
 
 (defn search [{:keys [clients query-params identity]}]
   
-  (doto (let [name-like-ids (when (not-empty (get query-params "q"))
-                              (set (map (comp #(Long/parseLong %) :id)
-                                        (doto 
-                                            (solr/query solr/impl "vendors"
-                                                        (doto 
-                                                            {"query"  (cond-> (format "name:(%s*)" (str/upper-case (solr/escape (get query-params "q"))))
-                                                                        (not (is-admin? identity)) (str " hidden:false"))
-                                                             "fields" "id"
-                                                             "limit"  300}
-                                                          clojure.pprint/pprint))
-                                          clojure.pprint/pprint))))
-              _             (clojure.pprint/pprint name-like-ids)
-              valid-clients (for [n name-like-ids]
-                              {"value" n "label" (pull-attr (dc/db conn) :vendor/name n)})]
-          {:body (take 10 valid-clients)})
-    clojure.pprint/pprint))
+  (let [name-like-ids (when (not-empty (get query-params "q"))
+                        (map (comp #(Long/parseLong %) :id)
+                             (solr/query solr/impl "vendors"
+                                         {"query"  (cond-> (format "name:(%s*)" (str/upper-case (solr/escape (get query-params "q"))))
+                                                     (not (is-admin? identity)) (str " hidden:false"))
+                                          "fields" "id"
+                                          "limit"  300})))
+        valid-clients (for [n name-like-ids]
+                        {"value" n "label" (pull-attr (dc/db conn) :vendor/name n)})]
+    {:body (take 10 valid-clients)}))
 
 (def search (wrap-json-response search))