Fix handling of the origin trip plan id.