Improve logic for filter reports