Improve search for Vehicle.