Criteria now required for Find and Count

JAVA-1492