Improving autocomplete component