fixed more bugs with HostID