Fixed _source issue (again?), Updated the second _id check on commit to make sure everything is squeaky clean