LB-1563 Fix pagination: offset must be updated based on updates