added extra filtering for the report