more fixes for the global admin report

best viewed commit by commit