Fixed filtering issues with scroll and page reset