=== Fix Directory & Org Chart ===