Updated filters to compose