AutoComplete improved