Autocomplete bugfix