Clean up Filtering fix Scrolling