Try improving Infinite Scroll support