           :main-content
           (element :main-content
             (let [run (:run-for-row (om-next/props this))
-                  selected-job (or (not-empty
-                                    (:routed-entity/job (om-next/props this)))
-                                   (-> (om-next/props this)
-                                       :run-for-jobs
-                                       :jobs-for-first
-                                       first))
-                  selected-job-build (get-in (om-next/props this)
-                                             (into [:legacy/state]
-                                                   state/build-path))
-                  jobs (cond-> (-> (om-next/props this) :run-for-jobs :jobs-for-jobs)
-                         selected-job-build (assoc-in [0 :job/started-at]
-                                                      (:start_time selected-job-build)))]
+                  jobs (-> this
+                           om-next/props
+                           :run-for-jobs
+                           :run/jobs)]
               (html
                [:div
                 ;; We get the :run/id for free in the route params, so even

                    [:.hr-title
                     [:span (gstring/format "%s jobs in this workflow" (count jobs))]]]
                   (job-cards-row
                    (map (fn [job-data]
                           (job (om-next/computed
                                 job-data
                                 {:selected? (= (:job/name job-data)
                                                (:job/name selected-job))})))
                         jobs))])])))})))))

     `{(:run-for-row {:< :routed-entity/run})
       ~(om-next/get-query run-row/RunRow)}
     `{(:run-for-jobs {:< :routed-entity/run})
       [{:run/jobs ~(om-next/get-query Job)}]}
     {:routed-entity/job [:job/name
                          {:job/build [:build/vcs-type
                                       :build/org
