I second all of this! The Qingqiu part of Shen Qingqiu should never be on it's own and it's very important to specify which Shen Qingqiu a tag is (they are VERY different characters). For the places where Shen Qingqiu is corrected to Shen Jiu I'd prefer the "Shen Jiu | Shen Qingqiu" tag since that's clearer than "Original Shen Qingqiu" is.