Merge "Filter out irrelevant refs in TagMatcher"