Improving support for autocomplete