Worked on #517 add client filter for report