Fixes #1427. Filters are grouped in containers in step 2