FiltersHelper spec + minor changes