Autocomplete fix to work with external model