fixes #5191 - System Group -> Host Collections: address issues during PR review/test