Retain request data in vehicle journey queries

This allows for unified code paths independent of whether vehicle layout
data is already (partially) present, or needs a full query.