Reverted treat _id and id differently - #203