1.0.1: Choose the right page instead of change order