YH-203: Fixed public organization import