Move all matching responsibility to MbidMatcher