new draft of the filter block (is a little more organised)