Fixing STORE-157 (Infinite scrolling)