Only show cohort when cohort is not None

Merged Joren Vrancken requested to merge fix/552 into master

Closes #552 (closed)

Merge request reports