Changed: Reverted most _id changes back to id (part 2)