Fix replace _ with - in domain names