Changed routing setup on server side