Fix a design issue with the filter