Fixing autocomplete