Fix the composite filering