Tweaking autocomplete some more