This is 100% correct. Edit your 1099R and the covid questions are there however, if you live in New York updates are still pending for your NYS return. I completed my return and 2 days later I received a message that my NYS return was rejected pending updates to form 8915E. I didn't have any errors when I first filed but it's showing errors now for my NYS return. I've been checking everyday for a week now and as of today it's still not updated.
