diff --git a/hours.txt b/hours.txt
index b014e5c7..b8191082 100644
--- a/hours.txt
+++ b/hours.txt
@@ -1 +1,4 @@
 7/16/2020 4 hours
+
+5/25/2021 3 hours
+6/1/2021 0.5 hours
diff --git a/src/cljs/auto_ap/subs.cljs b/src/cljs/auto_ap/subs.cljs
index bb4c59f5..1853f006 100644
--- a/src/cljs/auto_ap/subs.cljs
+++ b/src/cljs/auto_ap/subs.cljs
@@ -230,6 +230,17 @@
                                      :content (:name v)})
                             searchable-vendors))))))
 
+(re-frame/reg-sub
+ ::all-vendors-index
+ :<- [::all-vendors]
+ (fn [all-vendors]
+   (doto (MiniSearch. #js {:fields #js ["name" "content"]
+                           :storeFields #js ["id" "name" "content"]})
+     (.addAll (clj->js (map (fn [v] {:id (:id v)
+                                     :name (:name v)
+                                     :content (:name v)})
+                            all-vendors))))))
+
 (re-frame/reg-sub
  ::all-vendors
  (fn [db]
diff --git a/src/cljs/auto_ap/views/pages/admin/rules/form.cljs b/src/cljs/auto_ap/views/pages/admin/rules/form.cljs
index 17fa02b5..74145e6e 100644
--- a/src/cljs/auto_ap/views/pages/admin/rules/form.cljs
+++ b/src/cljs/auto_ap/views/pages/admin/rules/form.cljs
@@ -172,13 +172,13 @@
                                      value
                                      (expense-accounts-field/can-replace-with-default? (:accounts data)))
                                 [[:accounts] (expense-accounts-field/default-account (:accounts data)
-                                                                                     @(re-frame/subscribe [::subs/vendor-default-account value (:client data)])
+                                                                                     @(re-frame/subscribe [::subs/vendor-default-account (:id value) (:client data)])
                                                                                      (:total data)
                                                                                      [])]
 
                                 (= [:client] field)
                                 [[:accounts] (expense-accounts-field/default-account (:accounts data)
-                                                                                     @(re-frame/subscribe [::subs/vendor-default-account (:vendor data) value])
+                                                                                     @(re-frame/subscribe [::subs/vendor-default-account (:id (:vendor data)) value])
                                                                                      (:total data)
                                                                                      [])
                                  [:bank-account] nil]
@@ -321,20 +321,22 @@
 
             (field "Assign Vendor"
                    [typeahead-v3 {:entities-by-id @(re-frame/subscribe [::subs/vendors-by-id])
-                                  :entity-index @(re-frame/subscribe [::subs/searchable-vendors-index])
+                                  :entity-index @(re-frame/subscribe [::subs/all-vendors-index])
                                   :entity->text :name
                                   :type "typeahead-v3"
                                   :field [:vendor]
                                   :spec ::entity/vendor}])
 
-            (field nil
-                   [expense-accounts-field {:type "expense-accounts"
-                                            :descriptor "account asssignment"
-                                            :percentage-only? true
-                                            :client (:client data)
-                                            :locations (into ["Shared"] @(re-frame/subscribe [::subs/locations-for-client-or-bank-account (:id (:client data)) (:id (:bank-account data))]))
-                                            :max 100
-                                            :field [:accounts]}])
+            (with-meta 
+              (field nil
+                     [expense-accounts-field {:type "expense-accounts"
+                                              :descriptor "account asssignment"
+                                              :percentage-only? true
+                                              :client (:client data)
+                                              :locations (into ["Shared"] @(re-frame/subscribe [::subs/locations-for-client-or-bank-account (:id (:client data)) (:id (:bank-account data))]))
+                                              :max 100
+                                              :field [:accounts]}])
+              {:key (some-> data :vendor :id str)})
 
             (field "Approval Status"
                    [button-radio