You are correct... but it is a pain if not answered properly the very first time. This is not user friendly. I had to completely delete the 1099R and reestablish it and then and only then was I able to select out of a string of possibilities if part of the distribution was a charitable contribution. Once identified that there was a CQD, it then prompted for the other questions. But...if you do not answer correctly the first time, it is extremely difficult to revise!
