A bit more reasonable autocomplete (II)