Improved filters (3 left to do).