Upgrade auto-complete and popup