One more re-work of ignoring host groups