    parameterizable URL segments (e.g. :user-id) to their values
    in the URL."
   [url]
-  (when-let [result (bidi/match-route (routes) url)]
-    {:params (:route-params result)
-     :screen (scr/resolve-screen (-> result :handler name symbol))}))
+  (when-let [location (bidi/match-route (routes) url)]
+    (match-location location)))
 
 (defn path
   "Returns a URL path for the given screen and the given URL

                      :name)]
    (apply (partial bidi/path-for (routes) screen-name)
           params)))

(ns workflo.macros.screen.bidi
  (:require [bidi.bidi :as bidi]
            [bidi.router :as br]
            [workflo.macros.screen :as scr]))

(defn route
