improve autocomplete