Fixes #5699: Improve general display when there is subsection