Retirement tax questions

Thanks a lot! I followed procedure and got some refund. Just to double check, 2021 Box 7 code is "8" that I filed in 2021. New 1099-R I received at 2022 has Box 7 code "E". But, when I filed this 1099-R in turbo tax now as you guided, I did enter Code "P" in this box. 

is is correct?

Also, it asks for amending, wondering as I filed 2021 with same Turbotax product, Turbotax automatically will amend it.