Using either patch (7 or 11/11_0) I'm still seeing the issues from comment #10. If I get everything right on the first entry, it's great. If I try to edit that file link with any new advanced elements, it wraps the entire paragraph. If I edit the file link and simply leave all the advanced fields empty, it does correctly remove them without issue.