Filters are grouped in containers in step 2

The filters were once displayed in a 2 column table. Now its grouped in containers by typeLabel and the specified order. More than one filter type can be grouped together if they have the same typeLabel, with spacing in between the different types
Fixes #1427.