Fix empty itinerary bug (introduced by me) and rollback changes to solution_model