Fixed the issues in addon domain and subdomain add