Vastly improve interactive mode selection