Some autocomplete tweaks