Improve infinite scroll handling.