Data parsing fix for scroll