Adjust Query to remove bug
Adjust reports