Autocomplete fix