DIG-1778: Improve timing of Query calls (#748)

* Offload most of the donor joins to Katsu

* Bugfix on None primary sites not getting counted

* Add katsu unit tests

* Code suggestions by @SonQBChau