                           {:keys [query-idx col-idx]}]
   (will-mount [_]
     (execute-query! owner (single-item-group-expr item-group)
-                    (cell-id query-idx col-idx id)))
+                    [:result-loaded query-idx col-idx id]))
   (did-update [_ _ _]
     (when-let [result (:result item-group)]
       (clear-chart (cell-id query-idx col-idx id))

                                  :loaded-topic [:loaded-form query-idx
                                                 col-idx id]}))
    (execute-query! owner (single-form-expr form)
                    (cell-id query-idx col-idx id)))
  (did-update [_ _ _]
    (when-let [result (:result form)]
      (clear-chart (cell-id query-idx col-idx id))

    (om/transact! version [] #(update-state % msg) :history)))

(defn empty-query [idx]
  (index-query idx {:query-grid {:cols (vec (repeat 3 {:cells []}))}
                    :result {}}))

(defn add-query-msg []
