Changes to support indexing with ES generated _id