Changes to accommodate a report with both indicator and cohort component...

...s