TNL-328 Cohort/server display auto

TNL-328