Fixing the filter clauses on `matches`