Modified autocomplete behaviour