Worked a bit on the filter subcomponent