Get itinerary 100% working with both vehicle strategy