current pagination and mark fix