Composites: Add option to filter composites