+ improved filtering structure for reports.