              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 "input[name=badge_name]"))
-                                     :issuer_name (.val (js/jQuery "input[name=issuer_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 []

     }))

(defn handler [site-navi]
  (let [state (atom {:tag {:value "" :autocomplete {}}})]
    (ajax/GET
      (path-for "/obpv1/location/explore/filters" false)
      {:handler
       (fn [data]
         (swap! state assoc-in [:tag    :autocomplete] (reduce (fn [coll v] (assoc coll v v)) {} (:tag_name    data))))})
    (fn []
      (layout/default site-navi [map-view state]))))


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

         (.on (js/jQuery "div.users-filter input, div.badges-filter input") "keyup change"
              (fn [e]
                (let [len (-> e .-target.value count)]
                (when (or (= len 0) (>= len 3))
                  (redraw-map!)))))

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