Fixed issue with keywords being split per character instead of per word