don't include tokenized matches in block/awc names
Merge pull request #5052 from dimagi/opm-fuzzy-match

don't include tokenized matches in block/awc names