      ; if the query does match and is the current live view
      (and
          (= (@data-view-atom :query) query-key)
-         (= (get @ui-paths-v2  (:full-path view-key))  view-key)
+         (= (get @ui-paths-v2  (:full-path data-window-key))  data-window-key)
         )
 
      (let [

           view-start       (:start @data-view-atom)
           view-end         (:end @data-view-atom)

           data-source      (:data-source view-key)
           full-path        (:full-path view-key)
           ui-full-path     (conj full-path  :values)

           value-path   (conj full-path :values)

           start-path   (conj full-path :start)
           order-path   (conj full-path :order)

           rel-path         (get data-window-key :relative-path)
           rel-value-path   (conj rel-path :values)
           rel-count-path   (conj rel-path :count)
           rel-end-path     (conj rel-path :end)
