current pagination and mark fix2