Fixed issue with domain_name not always containing a tld