Improving the filter form