KeywordsHandler refactored