Correctly show the comments in the "comments" element (see #7040)