Infinite scroll enhancements.

see #585