Update filter logic
Merge pull request #2798 from dimagi/fri-report-update2

Update filter logic