[NPG] Correctly handle corporate authors