Improve getVehicleTypes to be a bit more flexible