Bug fix to routes and subdomains