Fix new airport bugs, eliminate unneeded airport select view