changes to host entity (no more loose matching)