Updates to reports, but have to wait for fixes to queries