handleKeywords fix