Fix org chart auto-expand in picker if current user is not in org chart
Comment out unused type