Fixed match columns to avoid FPs

Sorry, have mixed the "Match 1 Or" and "Match1 And" for this test. This fix will avoid FPs.