A continuation of commit e4d83d02495747c8fb7671e5 for filtered output.