A few more improvements to autocomplete