Fix upserts for routes - seems to work