Autocomplete greatly improved