updated filtering
working on ReportParameters