More fixes to new notes system when used in translations