Fix #171. Removed KeywordSearchService