Sorting and expanding of itinerary
Merged changes