Fix autocomplete again