simplify FieldMatcher logic