Added support for null criteria values