SONAR-5007 Fix infinite scrolling