report fixes to make national dashboard work
Merge branch 'master' of https://github.com/RiscaJack/HCMPv2