Changes across to make sure pagination is used correctly.