Clean up domain checking, to ensure we are only returning the same domain name once