Domain name extraction bug fix