More autocomplete tweaks