TNL-328 Cohort/server display auto

[TNL-180](https://openedx.atlassian.net/browse/TNL-180)

Yes, and the 3 cases below as well.  (I didn't catch them when you mentioned the same issue on L64 above.)