few fixes for subdomains