Simplify new KeywordSearchManager class