Improve intent of the regex used to strip out _id, and other PR fixes