Feature/67 categorize matchers based on tags