diff --git a/src/clj/auto_ap/ssr/company/company_1099.clj b/src/clj/auto_ap/ssr/company/company_1099.clj
index 33400c3b..020018d1 100644
--- a/src/clj/auto_ap/ssr/company/company_1099.clj
+++ b/src/clj/auto_ap/ssr/company/company_1099.clj
@@ -16,12 +16,12 @@
              (:vendor/legal-entity-tin vendor)
              (:vendor/legal-entity-tin-type vendor))))
 
-(defn get-1099-companies [user]
+(defn get-1099-companies [user session]
   (let [clients (->> (d/q '[:find ?c
-                            :in $ ?user
+                            :in $ ?user ?c
                             :where [?c :client/code]
                             [(auto-ap.graphql.utils/can-see-client? ?user ?c)]]
-                          (d/db conn) user)
+                          (d/db conn) user (some-> session :client :db/id))
                      (map first)
                      set)]
     (->> (if (is-admin? user)
@@ -42,7 +42,7 @@
                             :vendor/legal-entity-last-name])
                   (sum ?a)
                   :with ?d 
-                  :in $
+                  :in $ ?c
                   :where
                   [?p :payment/date ?d ]
                   [(>= ?d #inst "2022-01-01T08:00")]
@@ -51,7 +51,8 @@
                   [?p :payment/client ?c]
                   [?p :payment/amount ?a]
                   [?p :payment/vendor ?v]]
-                (d/db conn))
+                (d/db conn)
+                (some-> session :client :db/id))
            (d/q '[:find
                   (pull ?c [:client/code :db/id])
                   (pull ?v [:db/id
@@ -99,8 +100,13 @@
      footer]]
    [:button.modal-close.is-large {"_" (hiccup/raw "on click remove <#modal-holder div/>")}]])
 
-(defn table [{:keys [identity]} & {:keys [flash-id]}]
-  [:table#vendor-table.table.grid.compact.is-fullwidth
+(defn table [{:keys [identity session]} & {:keys [flash-id]}]
+  
+  [:table#vendor-table.table.grid.compact.is-fullwidth {:hx-get     (bidi/path-for ssr-routes/only-routes
+                                                                                   :company-1099-vendor-table
+                                                                                   :request-method :get) 
+                                                        :hx-trigger "clientSelected from:body"
+                                                        :hx-swap    "outerHTML"}
    [:thead
     [:tr
      [:th {:style {:width "5em"}}"Client"]
@@ -113,7 +119,7 @@
      [:th {:style {:width "10em"}}]
      ]]
    [:tbody
-    (for [[client vendor amount] (get-1099-companies identity)]
+    (for [[client vendor amount] (get-1099-companies identity session)]
       [:tr (when (= flash-id
                     (:db/id vendor))
              {:class "live-added"})
@@ -313,7 +319,7 @@
      [:div#vendor-table {:hx-get     (bidi/path-for ssr-routes/only-routes
                                                     :company-1099-vendor-table
                                                     :request-method :get) 
-                         :hx-trigger "load"
+                         :hx-trigger "load, clientSelected from:body"
                          :hx-swap    "outerHTML"}
       [:div.container 
        [:div.column.is-4.is-offset-4.has-text-centered
diff --git a/src/clj/auto_ap/ssr/company_dropdown.clj b/src/clj/auto_ap/ssr/company_dropdown.clj
index 52c6e28e..011c9ba5 100644
--- a/src/clj/auto_ap/ssr/company_dropdown.clj
+++ b/src/clj/auto_ap/ssr/company_dropdown.clj
@@ -81,7 +81,6 @@ document.getElementById(\"company-search-value\").dispatchEvent(new Event('chang
                       "_" (hiccup/raw
                             "on click
                               toggle .is-active on <#company-dropdown />
-                              then focus() on next <#company-dropdown input/>
                              end
                              ")
                       }
@@ -100,4 +99,6 @@ document.getElementById(\"company-search-value\").dispatchEvent(new Event('chang
       (html-response 
         (dropdown (assoc request :session new-session)))
       :session
-      new-session)))
+      new-session
+      :headers
+      {"hx-trigger" "clientSelected"})))