use tap, clean airport lookup. (refactor based on PR notes)