Minor pagination improvements