More work on the report filtering for bug #8378.  It mostly works.