updated reports + queries
merge