autocomplete improvements
merge