Fix __singular references for sub note labels