Updated custom report query