Fix the new pagination requirements.