   (let [props #(select-keys % ubiquitous-keys)]
     (merge
       (props spec)
-      (when-let [v (data (:entity spec))]
+      (when-let [v (get data (:entity spec))]
         (if (map? v)
           (props v)
           {:value v})))))

        out (om/get-state owner :commit-chan)]
    (go-loop []
      (let [[_ a v :as msg] (async/<! in)]
        (om/update! data a v)
        (when out
          (async/>! out msg)))
      (recur))))

(defn- setup-commit [data owner opts]

        pubc (om/get-state owner :update-pubc)
        chan (om/get-state owner :intern-chan)]
    (async/sub pubc :combo/commit chan)
    (when data (commit data owner))))

(defn view [data owner opts]
  (reify
