Fix infinite scroll and data property