Make some changes on the routes to fix the server issue