Fixed infinite scroll bugs