Fixed autocomplete behaviour