Simplified reporting

This is branched off of https://github.com/dimagi/commcare-hq/pull/4571 and should not be merged first.
I'll fix this on a separate PR.