Fix pagination problems injected by version upgrade.