Changed: Reverted most _id changes back to id