handle more cases with missing memberof information, change handling for union types