   ----
   * **:set-type** is either `:train`, `:test`, `:train-test` (all) and defaults
   to [[set-default-set-type]] or `:train` if not set
-  * **:include-keys?** if non-`nil` return keys in the map as well"
-  [& {:keys [set-type include-keys?] :as keys}]
+  * **:include-ids?** if non-`nil` return keys in the map as well"
+  [& {:keys [set-type include-ids?]}]
   (let [conn (connection)]
     (->> (ids :set-type set-type)
-         (map (if include-keys?
+         (map (if include-ids?
                 #(assoc (instance-by-id conn %) :id %)
                 #(instance-by-id conn %))))))
 

  ([id instance class-label set-type]
   (log/infof "loading instance (%s): %s => <%s>"
               id class-label
               (let [s (pr-str instance)]
                 (subs s 0 (min 80 (count s)))))
   (log/debugf "instance: %s" instance)
   (use-connection
     (with-context [instance-context]
       (let [doc (merge {:dataset {:class-label class-label
                                   :instance instance}}
                        (if set-type {:set-type set-type}))
             res (if id
                   (es/put-document id doc)

    :or {create-instances-fn identity
         population-use 1.0
         set-type :train
         mapping-type-def {instance-key {:type "nested"}}
         url "http://localhost:9200"}}]
  {:index-name index-name
   :ids-inst (atom nil)
