Fixed some bugs for the 'Already have a flight' query (uncovered by Portia).