Allow tag-based terms to have multiple options
Be more discerning when checking the term
Account for the first term in the list being contained in another
Merge pull request #208 from cmc333333/terms-tweaks

Tweaks to terms layer