Improved the page filter