fixes #5191 - System Group -> Host Collections: fixes from testing