mattdrayer/api: Fixes to support Apros cohort page