OZP-856 Fix for criteria query.