Fix the routes ordering