Retirement tax questions

I have a very similar question. In my previous research, a different community expert responded to the same type of question last year and indicated that if the excess funds are returned after the tax year but before 4/15, do not create a 1099-R and instead include the returned funds as income on line 1 on the 1040, then follow misc income instructions referenced above.  This appears to be slightly different from your earlier response. Also, with-in TurboTax, in the drop down box for the description, there is only a selection for "2021 Excess 401k Deferrals" but no option for "2022 Excess 401k Deferrals".  Is there any update to the s/w required?