Update host matching logic