fix FieldValue in optional embedded fields