Hostgroups tweaks