bug fix in string search, and domain match