fixes to keywordmatcher