Fix design issue with the filter