Simplified reporting

This is branched off of https://github.com/dimagi/commcare-hq/pull/4571 and should not be merged first.
I see it's over [here](https://github.com/dimagi/commcare-hq/pull/4571/files#diff-ee9e98cd8bdccf071fcd4405d00b0328R44) and [here](https://github.com/dimagi/commcare-hq/pull/4571/files#diff-ee9e98cd8bdccf071fcd4405d00b0328R57) too, which has already been merged. Do you intend to fix that in this PR, or at some later point?