Autocomplete improvements