Add ccm-block-field-group div, remove extra div

Let's the *Filter* section have its own ccm-block-field-group (it might be envious of the others h2 tags :wink:) and remove a misplaced/unclosed `<div>`