Refactor & fix total donors query