Correct trip classification, to take better account of 'bad_location' points