made the autocomplete a bit more resilient