Added more criteria for cases exporter