Dvk/handle non uuid

Handle non-uuid ids; handle __shard_index inserts properly