             (let [entries (entries-for-org conn (:uuid o))]
               (println "Org:" (:uuid o) "-" (:name o))
               (doseq [e entries]
-                (migrate-follow-ups-for-entry conn e (:self-only options) (not (:force-update options)))))))
+                (migrate-follow-ups-for-entry conn e
+                 (:self-only options)                 ; Only self created follow-ups
+                 (not (:force-update options))        ; Make changes in DB, no dry-run
+                 (and (:force-update options)         ; Complete the relative follow-up,
+                      (:complete-follow-ups options)) ; use this to keep them to re-run the import
+                 )))))
         (delete-temp-index conn)
         (exit 0 "\n")
 
         (catch Exception e
           (println e)
           (delete-temp-index conn)
-          (exit 1 "Bookmark migration exception."))))))+          (exit 1 "Bookmark migration exception."))))))

      (f (first items)) idx
      :else (recur (inc idx) (rest items)))))

(defn- migrate-follow-ups-for-entry [conn e self-only? dry-run?]
  (let [follow-ups (:follow-ups e)
        new-bookmarks (remove nil? (mapv #(when (and (not (:completed? %))
                                           (or (not self-only?)

  "Get all the existing uncompleted follow-ups and create a bookmark for every one of them.
   To perform a dry run and simulate the update use:

  lein run -m oc.storage.util.migrate-bookmarks

  To actually update the entries:

  lein run -m oc.storage.util.migrate-bookmarks -f

  Use -s/--self-only to create bookmarks only for self created follow-ups."

