fixes for routes and links