Improved checking for unexpected case of a record changing to different OAP ID.