Bugfix autocomplete