MS-212: make people show in all tags that are appropriate
Merge branch 'MS-212-also-show-employees' into develop