More autocomplete improvements