Correcting a 2020 Excess IRA contribution in Turbo Tax 2022

I made a 6000$ excess Roth IRA contribution in 2020 but only realized that I exceeded the limit in 2022. 

In 2022,  I amended the 2020 and 2021 returns and paid 6% penalty for each of these years.

I removed the 6000$ from my Roth IRA before the end of 2022 so I received a 1099-R with Code J in box 7. 

(the broker did not calculate the taxable portion -- the 'taxable amount not determined' box is checked)

Reading Publication 590-A and many previous discussions on this website, the 6000$ early distribution should not be 10% taxed. the earning on the excess can be kept in the Roth IRA and are not subject to tax. 

Can you please confirm if I should do anything else to correct the excess ( should I report the earning ? )

The second issue I have is that the TurboTax tool is automatically applying 10% tax on this 6000$ distribution, I can't figure out how I can mark it as non-taxable.