Fixes #1427. Filters are grouped in containers in step 2
Merge pull request #1469 from aodn/issue-1427

Filters are grouped in containers in step 2