Make the filter a bit more modular.