ref Task #8454 change paginate