Reports
Merge origin/master
Fixed some query bugs