more work on tag-matching export