Improved scrolling. Fixed filter application