updates for _id bug