AutoCompleter improvements