Fix controllers for subdomain support