Revisions to autocomplete