Fix infinite scroll feature