Improve performance for pbf import and itinerary research