Autocomplete

fixes