don't include tokenized matches in block/awc names

http://manage.dimagi.com/default.asp?150238