Improve autocomplete behavior