       :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

        service (->task-service service-id services)
        service-name (get-in service [:Spec :Name])
        service-mode (->service-mode (:Spec service))
        task-name (if (= "replicated" service-mode)
                    (str service-name "." slot)
                    service-name)]
    (array-map
      :id id
      :taskName task-name


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

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