Redo route for modal server, modify dao for sites and fix switch toggle servers activation