simplify expression
Merge pull request #4742 from dimagi/one-report-to-rule-them-all

simplify expression