Refactor & fix total donors query
Merge branch 'report' into staging