[XC-28] fixes to scroll to logic