#386, Improving the filter layout.