 
           [:div.form-group.badges-filter {:style {:display "none"}}
            [:div.col-md-6
-            [:input.form-control {:name "badge_name"
-                                  :type "text"
-                                  :placeholder (t :location/SearchBadges)}]
-            ]]
-          [:div.form-group.badges-filter {:style {:display "none"}}
-           [:div.col-md-6
-            [:input.form-control {:name "issuer_name"
-                                  :type "text"
-                                  :placeholder (t :location/SearchIssuers)}]
-            ]]
+            [filter-autocomplete :badge state]]]
 
           [:div.form-group.badges-filter {:style {:display "none"}}
            [:div.col-md-6
-            [tag-autocomplete state]]]
+            [filter-autocomplete :issuer state]]]
+
+          [:div.form-group.badges-filter {:style {:display "none"}}
+           [:div.col-md-6
+            [filter-autocomplete :tag state]]]
 
           ]
 


         (.on my-map "moveend" redraw-map!)

         (.on (js/jQuery "div.users-filter input, div.badges-filter input") "keyup change" redraw-map!)

         (.on (js/jQuery "input[name=map-type]") "change"
              (fn [e]

             query-opt (fn []
                         (case (.val (js/jQuery "input[name=map-type]:checked"))
                           "users"  {:user_name (.val (js/jQuery "input[name=user_name]"))}
                           "badges" {:badge_name  (.val (js/jQuery ".badge-filter input"))
                                     :issuer_name (.val (js/jQuery ".issuer-filter input"))
                                     :tag_name    (.val (js/jQuery ".tag-filter input"))}))

             redraw-map! (fn []
