Instead of using the String constants MatchCriteria.EQUALS, MatchCriteria.GREATER, etc, an enum should be created for these operators. This way, we could better assure the type safety of MatchCriteria ...