Proper handling of embedded fields within embedded fields