Retirement tax questions

Something still doesn't seem right in filling out 1099-R as a part of the 2018 amending.  2018 1099-R, Box 7, when I select "P" it states "P-Return of contribution taxable in 2017."    This is for contribution made in 2018, not 2017. Also I have a 2019 1099-R, which doesn't seem reasonable to create a 2018 1099-R.