Merge pull request #14040 from Zlash65/fix-dept

[Minor] Department tree fixes