Retweak of pagination with new variables.