remove circular dependency from matchTags

For your approval