ref #7415: move type at top and shorter labels
ref #7415: add external link section to original source part