Better regular expressions for single words, work-in-progress for multiple-word terms