Fixed infinite scroll issues