Incorporate latest report feedback
Merge pull request #1820 from dimagi/fri-report-feedback

Incorporate latest report feedback