       :state (get-in task [:Status :State])
       :status {:error (get-in task [:Status :Err])}
       :desiredState (:DesiredState task)
-      :serviceName service-name
+      :serviceName (or service-name service-id)
       :nodeName (or node-name node-id))))
 
 (defn ->tasks


(defn- ->service-mode
  [service-spec]
  (str/lower-case (name (first (keys (:Mode service-spec))))))

(defn ->task-node
  [node-id nodes]

        service (->task-service service-id services)
        service-name (get-in service [:Spec :Name])
        service-mode (->service-mode (:Spec service))
        task-name (->task-name id node-id slot service-name service-mode)]
    (array-map
      :id id
      :taskName task-name
