Refactored nested queries to be built appropriately; fixed display of airline names