UID legacy correction for body and note field added