Request for Foreign FEIN a continuing problem with TT

I receive a pension from Canada.  And there is withholding tax.  I have to submit a Substitute 1099-R. TT always asks for employer's FEIN, which of course it does not have. In past years, the work-around was to submit 11-1111111 or 9's or 0's. Doesn't work for 2023. The TT experts say to report it as "Other Income" and perhaps do a workaround for manually adjusting your F1116 to get your foreign tax credit.

THE problem is that if I enter the pension as "Other Income", it will not be treated as pension income, which is taxed differently in each state. I have to be able to treat it as pension income. WHY can't TurboTax fix this enduring problem so that I don't have to file a print copy! It is SO FRUSTRATING!