Changes to report queries