Additional improvements to Autocomplete.