Re: [discovery] PrefixSearch/SearchEngine refactoring