refs task#10100 Change pagination