Merge pull request #18596 from hrwX/qms-fixes

fix(QMS): TreeView fixes