RF-13486, RF-13487: fix datascroller