Fixed report query (kinda)

Researching better ways of combining queries.