Improving Autocomplete plugin