Fixes #8333 - correct matcher values with multi-key matchers