fix and improve airline toggling functionality.