[FIX] CORS routing should use new routing api