MDL-42031 fix next/previous/select page