Improve behavior of filter preparation.