Fixed queries and setup for "Reports" module