Multiple orgchart fixes and minor enhancements