Some fixes about the infinite scroll.

see #585