add better support for auto-complete