Removed isKeyword/parseKeywordList and make use of StringUtils method