Autocomplete query tweak