Fix autocomplete