From 77fb6367a804a19e14874b408c35ec9d78ce7309 Mon Sep 17 00:00:00 2001
From: Benjamin Renard <benjamin.renard@akka.eu>
Date: Thu, 16 May 2024 08:10:49 +0200
Subject: [PATCH] Cleanup master/amdadev - Second part

---
 Instrument/CDPP-AMDA/BepiColombo/Models.xml                        |   5 +++--
 Instrument/CDPP-AMDA/MESSENGER/Models.xml                          |   5 +++--
 Instrument/CDPP-AMDA/Mariner10/Models.xml                          |   5 +++--
 Instrument/CDPP-AMDA/Solar_Orbiter/EAS.xml                         |   1 -
 Instrument/CDPP-AMDA/Solar_Orbiter/HIS.xml                         |   1 -
 NumericalData/CDPP-AMDA/BepiColombo/Models/bepi-kt17-model1.xml    |  15 +++------------
 NumericalData/CDPP-AMDA/BepiColombo/Models/bepi-kt17-model2.xml    |  15 +++------------
 NumericalData/CDPP-AMDA/BepiColombo/Models/bepi-kt17-model3.xml    |  15 +++------------
 NumericalData/CDPP-AMDA/Ephemerides/iapetus-orb-all.xml            |   6 ------
 NumericalData/CDPP-AMDA/Juno/Ephemeris/juno-cruise-all.xml         |  35 ++++-------------------------------
 NumericalData/CDPP-AMDA/Juno/Ephemeris/juno-ephem-orb1.xml         |  38 ++++++--------------------------------
 NumericalData/CDPP-AMDA/Juno/Ephemeris/juno-jupiter-all.xml        |  67 +++++++++----------------------------------------------------------
 NumericalData/CDPP-AMDA/Juno/Ephemeris/juno-jupiter-all1s.xml      |  66 +++++++++---------------------------------------------------------
 NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-cruise60.xml             |   6 +++---
 NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-orb1.xml                 |   6 +++---
 NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-orb60.xml                |   6 +++---
 NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-orbfull.xml              |   6 +++---
 NumericalData/CDPP-AMDA/Juno/JADE/juno-jade-e060.xml               |  12 ------------
 NumericalData/CDPP-AMDA/Juno/JADE/juno-jade-e180.xml               |  12 ------------
 NumericalData/CDPP-AMDA/Juno/JADE/juno-jade-e300.xml               |  12 ------------
 NumericalData/CDPP-AMDA/Juno/JADE/juno-jade-ions.xml               |  12 ------------
 NumericalData/CDPP-AMDA/Juno/JADE/juno-jadel5-e060.xml             |  18 ------------------
 NumericalData/CDPP-AMDA/Juno/JADE/juno-jadel5-e180.xml             |  18 ------------------
 NumericalData/CDPP-AMDA/Juno/JADE/juno-jadel5-e300.xml             |  18 ------------------
 NumericalData/CDPP-AMDA/Juno/JADE/juno-jadel5-elecmom.xml          |  16 ----------------
 NumericalData/CDPP-AMDA/Juno/JADE/juno-jadel5-heavmom.xml          |  24 ------------------------
 NumericalData/CDPP-AMDA/Juno/JADE/juno-jadel5-ions.xml             |  12 ------------
 NumericalData/CDPP-AMDA/Juno/JADE/juno-jadel5-protmom.xml          |  27 +--------------------------
 NumericalData/CDPP-AMDA/Juno/JEDI/juno-jedi-e090.xml               |  28 ----------------------------
 NumericalData/CDPP-AMDA/Juno/JEDI/juno-jedi-e180.xml               |  28 ----------------------------
 NumericalData/CDPP-AMDA/Juno/JEDI/juno-jedi-e270.xml               |  28 ----------------------------
 NumericalData/CDPP-AMDA/Juno/JEDI/juno-jedi-i090.xml               |  28 ----------------------------
 NumericalData/CDPP-AMDA/Juno/JEDI/juno-jedi-i180.xml               |  28 ----------------------------
 NumericalData/CDPP-AMDA/Juno/JEDI/juno-jedi-i270.xml               |  28 ----------------------------
 NumericalData/CDPP-AMDA/Juno/WAVES/juno-wav-crub.xml               |   5 -----
 NumericalData/CDPP-AMDA/Juno/WAVES/juno-wav-crue.xml               |  14 --------------
 NumericalData/CDPP-AMDA/Juno/WAVES/juno-wav-l3f.xml                |  14 +++-----------
 NumericalData/CDPP-AMDA/Juno/WAVES/juno-wav-orbb.xml               |   5 -----
 NumericalData/CDPP-AMDA/Juno/WAVES/juno-wav-orbe.xml               |  14 --------------
 NumericalData/CDPP-AMDA/MESSENGER/Models/mes-kt17-model.xml        |  15 +++------------
 NumericalData/CDPP-AMDA/MESSENGER/Models/mes-kt17-pds.xml          |  20 --------------------
 NumericalData/CDPP-AMDA/Mariner10/Models/m10-kt17-model.xml        |  15 +++------------
 NumericalData/CDPP-AMDA/OMNI/omni-1min-v2.xml                      |   8 ++++----
 NumericalData/CDPP-AMDA/OMNI/omni-5min-v2.xml                      |  10 ++++------
 NumericalData/CDPP-AMDA/Solar_Orbiter/EAS/solo-eas-pad.xml         |   3 ---
 NumericalData/CDPP-AMDA/Solar_Orbiter/EAS/solo-eas1-nm3d.xml       |   5 -----
 NumericalData/CDPP-AMDA/Solar_Orbiter/EAS/solo-eas2-nm3d.xml       |   5 -----
 NumericalData/CDPP-AMDA/Solar_Orbiter/HIS/solo-his-comp10min.xml   | 163 -------------------------------------------------------------------------------------------------------------------------------------------------------------------
 NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l3.mommag.xml     |  26 ++++++++------------------
 NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l3.momnomag.xml   |  26 ++++++++------------------
 NumericalData/CDPP-AMDA/Solar_Orbiter/RPW/so-rpw-peaktracking.xml  |   2 --
 NumericalData/CDPP-AMDA/Solar_Orbiter/RPW/solo-rpw-survbp1.bf0.xml |   5 -----
 NumericalData/CDPP-AMDA/Solar_Orbiter/RPW/solo-rpw-survbp1.bf1.xml |   5 -----
 NumericalData/CDPP-AMDA/Solar_Orbiter/RPW/solo-rpw-survbp1.nf0.xml |   5 -----
 NumericalData/CDPP-AMDA/Solar_Orbiter/RPW/solo-rpw-survbp1.nf1.xml |   5 -----
 NumericalData/CDPP-AMDA/Solar_Orbiter/RPW/solo-rpw-survbp1.nf2.xml |   5 -----
 NumericalOutput/CDPP-AMDA/JRM33/b_jrm33.xml                        |   2 +-
 Observatory/CDPP-AMDA/Giotto.xml                                   |   2 +-
 Person/CDPP-AMDA/C.K.Louis.xml                                     |   3 +--
 Person/CDPP-AMDA/Haje.Korth.xml                                    |   2 +-
 Person/CDPP-AMDA/M.K.James.xml                                     |   3 +--
 61 files changed, 97 insertions(+), 937 deletions(-)

diff --git a/Instrument/CDPP-AMDA/BepiColombo/Models.xml b/Instrument/CDPP-AMDA/BepiColombo/Models.xml
index b6566bc..4742777 100644
--- a/Instrument/CDPP-AMDA/BepiColombo/Models.xml
+++ b/Instrument/CDPP-AMDA/BepiColombo/Models.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <Spase xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.spase-group.org/data/schema" xsi:schemaLocation="http://www.spase-group.org/data/schema http://www.spase-group.org/data/schema/spase-2.4.1.xsd">
   <Version>2.4.1</Version>
   <Instrument>
@@ -13,7 +14,7 @@
       </Contact>
     </ResourceHeader>
     <InstrumentType>Platform</InstrumentType>
-    <InvestigationName/>
+    <InvestigationName>KT17: Mercury magnetic field model</InvestigationName>
     <ObservatoryID>spase://CNES/Observatory/CDPP-AMDA/BepiColombo</ObservatoryID>
   </Instrument>
-</Spase>
\ No newline at end of file
+</Spase>
diff --git a/Instrument/CDPP-AMDA/MESSENGER/Models.xml b/Instrument/CDPP-AMDA/MESSENGER/Models.xml
index d8f1584..db69205 100644
--- a/Instrument/CDPP-AMDA/MESSENGER/Models.xml
+++ b/Instrument/CDPP-AMDA/MESSENGER/Models.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <Spase xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.spase-group.org/data/schema" xsi:schemaLocation="http://www.spase-group.org/data/schema http://www.spase-group.org/data/schema/spase-2.4.1.xsd">
   <Version>2.4.1</Version>
   <Instrument>
@@ -13,7 +14,7 @@
       </Contact>
     </ResourceHeader>
     <InstrumentType>Platform</InstrumentType>
-    <InvestigationName/>
+    <InvestigationName>KT17: Mercury magnetic field model</InvestigationName>
     <ObservatoryID>spase://CNES/Observatory/CDPP-AMDA/MESSENGER</ObservatoryID>
   </Instrument>
-</Spase>
\ No newline at end of file
+</Spase>
diff --git a/Instrument/CDPP-AMDA/Mariner10/Models.xml b/Instrument/CDPP-AMDA/Mariner10/Models.xml
index 69892e8..f7bb8ed 100644
--- a/Instrument/CDPP-AMDA/Mariner10/Models.xml
+++ b/Instrument/CDPP-AMDA/Mariner10/Models.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <Spase xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.spase-group.org/data/schema" xsi:schemaLocation="http://www.spase-group.org/data/schema http://www.spase-group.org/data/schema/spase-2.4.1.xsd">
   <Version>2.4.1</Version>
   <Instrument>
@@ -13,7 +14,7 @@
       </Contact>
     </ResourceHeader>
     <InstrumentType>Platform</InstrumentType>
-    <InvestigationName/>
+    <InvestigationName>KT17: Mercury magnetic field model</InvestigationName>
     <ObservatoryID>spase://CNES/Observatory/CDPP-AMDA/Mariner10</ObservatoryID>
   </Instrument>
-</Spase>
\ No newline at end of file
+</Spase>
diff --git a/Instrument/CDPP-AMDA/Solar_Orbiter/EAS.xml b/Instrument/CDPP-AMDA/Solar_Orbiter/EAS.xml
index c9c3ff8..3055e67 100644
--- a/Instrument/CDPP-AMDA/Solar_Orbiter/EAS.xml
+++ b/Instrument/CDPP-AMDA/Solar_Orbiter/EAS.xml
@@ -16,7 +16,6 @@
       the instrument samples the three dimensional electron VDFs. In burst mode, one of the two analyser units covers the two-dimensional 
       pitch angle distributions of the solar wind electrons allowing the study of basic plasma mechanisms along and perpendicular to 
       the magnetic field direction.</Description>        
-      <Acknowledgement></Acknowledgement>
       <Contact>
         <PersonID>spase://CNES/Person/CDPP-AMDA/C.J.Owen</PersonID>
         <Role>PrincipalInvestigator</Role>
diff --git a/Instrument/CDPP-AMDA/Solar_Orbiter/HIS.xml b/Instrument/CDPP-AMDA/Solar_Orbiter/HIS.xml
index d0cc166..8591840 100644
--- a/Instrument/CDPP-AMDA/Solar_Orbiter/HIS.xml
+++ b/Instrument/CDPP-AMDA/Solar_Orbiter/HIS.xml
@@ -12,7 +12,6 @@
       distribution of some prominent minor species. Also, pick-up ions of various origins, such as weakly-ionized species 
       (C+, N+, Ne+, Mg+, Si+, etc.), should be measured. The sensor is sun pointing.
      </Description>        
-      <Acknowledgement></Acknowledgement>
       <Contact>
         <PersonID>spase://SMWG/Person/Stefano.A.Livi</PersonID>
         <Role>PrincipalInvestigator</Role>
diff --git a/NumericalData/CDPP-AMDA/BepiColombo/Models/bepi-kt17-model1.xml b/NumericalData/CDPP-AMDA/BepiColombo/Models/bepi-kt17-model1.xml
index 10ccc39..89bec21 100644
--- a/NumericalData/CDPP-AMDA/BepiColombo/Models/bepi-kt17-model1.xml
+++ b/NumericalData/CDPP-AMDA/BepiColombo/Models/bepi-kt17-model1.xml
@@ -83,11 +83,9 @@
       <Cadence>PT1M</Cadence>
     </TemporalDescription>
     <ObservedRegion>Mercury</ObservedRegion>
-    <Caveats/>
     <Parameter>
       <Name>b msm</Name>
       <ParameterKey>b_kt17_model_60_0.378_50_bepi_xyz_mso1</ParameterKey>
-      <Description/>
       <Units>nT</Units>
       <Structure>
         <Size>3</Size>
@@ -96,26 +94,19 @@
           <Qualifier>Component.I</Qualifier>
           <Index>1</Index>
           <ParameterKey>b_kt17_model_60_0.378_50_bepi_xyz_mso1(0)</ParameterKey>
-          <ValidMin/>
-          <ValidMax/>
-        </Element>
+          </Element>
         <Element>
           <Name>by</Name>
           <Qualifier>Component.J</Qualifier>
           <Index>2</Index>
           <ParameterKey>b_kt17_model_60_0.378_50_bepi_xyz_mso1(1)</ParameterKey>
-          <ValidMin/>
-          <ValidMax/>
-        </Element>
+          </Element>
         <Element>
           <Name>bz</Name>
           <Qualifier>Component.K</Qualifier>
           <Index>3</Index>
           <ParameterKey>b_kt17_model_60_0.378_50_bepi_xyz_mso1(2)</ParameterKey>
-          <ValidMin/>
-          <ValidMax/>
-          <FillValue/>
-        </Element>
+          </Element>
       </Structure>
       <Field>
         <FieldQuantity>Magnetic</FieldQuantity>
diff --git a/NumericalData/CDPP-AMDA/BepiColombo/Models/bepi-kt17-model2.xml b/NumericalData/CDPP-AMDA/BepiColombo/Models/bepi-kt17-model2.xml
index d22889f..4791935 100644
--- a/NumericalData/CDPP-AMDA/BepiColombo/Models/bepi-kt17-model2.xml
+++ b/NumericalData/CDPP-AMDA/BepiColombo/Models/bepi-kt17-model2.xml
@@ -83,11 +83,9 @@
       <Cadence>PT1M</Cadence>
     </TemporalDescription>
     <ObservedRegion>Mercury</ObservedRegion>
-    <Caveats/>
     <Parameter>
       <Name>b msm</Name>
       <ParameterKey>b_kt17_model_60_0.377_50_bepi_xyz_mso2</ParameterKey>
-      <Description/>
       <Units>nT</Units>
       <Structure>
         <Size>3</Size>
@@ -96,26 +94,19 @@
           <Qualifier>Component.I</Qualifier>
           <Index>1</Index>
           <ParameterKey>b_kt17_model_60_0.377_50_bepi_xyz_mso2(0)</ParameterKey>
-          <ValidMin/>
-          <ValidMax/>
-        </Element>
+          </Element>
         <Element>
           <Name>by</Name>
           <Qualifier>Component.J</Qualifier>
           <Index>2</Index>
           <ParameterKey>b_kt17_model_60_0.377_50_bepi_xyz_mso2(1)</ParameterKey>
-          <ValidMin/>
-          <ValidMax/>
-        </Element>
+          </Element>
         <Element>
           <Name>bz</Name>
           <Qualifier>Component.K</Qualifier>
           <Index>3</Index>
           <ParameterKey>b_kt17_model_60_0.377_50_bepi_xyz_mso2(2)</ParameterKey>
-          <ValidMin/>
-          <ValidMax/>
-          <FillValue/>
-        </Element>
+          </Element>
       </Structure>
       <Field>
         <FieldQuantity>Magnetic</FieldQuantity>
diff --git a/NumericalData/CDPP-AMDA/BepiColombo/Models/bepi-kt17-model3.xml b/NumericalData/CDPP-AMDA/BepiColombo/Models/bepi-kt17-model3.xml
index acd1765..21d1935 100644
--- a/NumericalData/CDPP-AMDA/BepiColombo/Models/bepi-kt17-model3.xml
+++ b/NumericalData/CDPP-AMDA/BepiColombo/Models/bepi-kt17-model3.xml
@@ -83,11 +83,9 @@
       <Cadence>PT1M</Cadence>
     </TemporalDescription>
     <ObservedRegion>Mercury</ObservedRegion>
-    <Caveats/>
     <Parameter>
       <Name>b msm</Name>
       <ParameterKey>b_kt17_model_60_0.324_50_bepi_xyz_mso3</ParameterKey>
-      <Description/>
       <Units>nT</Units>
       <Structure>
         <Size>3</Size>
@@ -96,26 +94,19 @@
           <Qualifier>Component.I</Qualifier>
           <Index>1</Index>
           <ParameterKey>b_kt17_model_60_0.324_50_bepi_xyz_mso3(0)</ParameterKey>
-          <ValidMin/>
-          <ValidMax/>
-        </Element>
+          </Element>
         <Element>
           <Name>by</Name>
           <Qualifier>Component.J</Qualifier>
           <Index>2</Index>
           <ParameterKey>b_kt17_model_60_0.324_50_bepi_xyz_mso3(1)</ParameterKey>
-          <ValidMin/>
-          <ValidMax/>
-        </Element>
+          </Element>
         <Element>
           <Name>bz</Name>
           <Qualifier>Component.K</Qualifier>
           <Index>3</Index>
           <ParameterKey>b_kt17_model_60_0.324_50_bepi_xyz_mso3(2)</ParameterKey>
-          <ValidMin/>
-          <ValidMax/>
-          <FillValue/>
-        </Element>
+          </Element>
       </Structure>
       <Field>
         <FieldQuantity>Magnetic</FieldQuantity>
diff --git a/NumericalData/CDPP-AMDA/Ephemerides/iapetus-orb-all.xml b/NumericalData/CDPP-AMDA/Ephemerides/iapetus-orb-all.xml
index a44b99c..f70c622 100644
--- a/NumericalData/CDPP-AMDA/Ephemerides/iapetus-orb-all.xml
+++ b/NumericalData/CDPP-AMDA/Ephemerides/iapetus-orb-all.xml
@@ -60,7 +60,6 @@
     <Parameter>
       <Name>distance iapetus-saturn</Name>
       <ParameterKey>iap_sat_r</ParameterKey>
-      <UCD/>
       <Units>Rs</Units>
       <RenderingHints>
         <DisplayType>TimeSeries</DisplayType>
@@ -72,7 +71,6 @@
     <Parameter>
       <Name>xyz_ksm</Name>
       <ParameterKey>iap_sat_ksm</ParameterKey>
-      <UCD/>
       <Units>Rs</Units>
       <CoordinateSystem>
         <CoordinateRepresentation>Cartesian</CoordinateRepresentation>
@@ -106,7 +104,6 @@
     <Parameter>
       <Name>xyz_kso</Name>
       <ParameterKey>iap_sat_kso</ParameterKey>
-      <UCD/>
       <Units>Rs</Units>
       <CoordinateSystem>
         <CoordinateRepresentation>Cartesian</CoordinateRepresentation>
@@ -140,7 +137,6 @@
     <Parameter>
       <Name>xyz_IAU_saturn</Name>
       <ParameterKey>iap_sat_xyz</ParameterKey>
-      <UCD/>
       <Units>Rs</Units>
       <RenderingHints>
         <DisplayType>TimeSeries</DisplayType>
@@ -170,7 +166,6 @@
     <Parameter>
       <Name>latitude IAU_saturn</Name>
       <ParameterKey>iap_sat_lat</ParameterKey>
-      <UCD/>
       <Units>deg</Units>
       <Support>
         <SupportQuantity>Positional</SupportQuantity>
@@ -179,7 +174,6 @@
     <Parameter>
       <Name>longitude IAU_saturn</Name>
       <ParameterKey>iap_sat_lon</ParameterKey>
-      <UCD/>
       <Units>deg</Units>
       <Support>
         <SupportQuantity>Positional</SupportQuantity>
diff --git a/NumericalData/CDPP-AMDA/Juno/Ephemeris/juno-cruise-all.xml b/NumericalData/CDPP-AMDA/Juno/Ephemeris/juno-cruise-all.xml
index 9870f73..0500918 100644
--- a/NumericalData/CDPP-AMDA/Juno/Ephemeris/juno-cruise-all.xml
+++ b/NumericalData/CDPP-AMDA/Juno/Ephemeris/juno-cruise-all.xml
@@ -7,7 +7,6 @@
       <ResourceName>cruise</ResourceName>
       <ReleaseDate>2020-01-20T16:20:31Z</ReleaseDate>
       <Description>Calculated in IRAP by using Juno SPICE kernels</Description>
-      <Acknowledgement/>
       <Contact>
         <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID>
         <Role>PrincipalInvestigator</Role>
@@ -16,12 +15,7 @@
         <PersonID>spase://SMWG/Person/Elena.Budnik</PersonID>
         <Role>TechnicalContact</Role>
       </Contact>
-      <InformationURL>
-        <Name/>
-        <URL/>
-        <Description/>
-      </InformationURL>
-    </ResourceHeader>
+      </ResourceHeader>
     <AccessInformation>
          <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
          <Availability>Online</Availability>
@@ -66,10 +60,7 @@
     <Parameter>
       <Name>xyz_iau_sun</Name>
       <ParameterKey>juno_cruise_xyz</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>AU</Units>
-      <UnitsConversion/>
       <Structure>
         <Size>3</Size>
         <Element>
@@ -77,28 +68,19 @@
           <Qualifier>Component.I</Qualifier>
           <Index>1</Index>
           <ParameterKey>juno_cruise_xyz(0)</ParameterKey>
-          <ValidMin/>
-          <ValidMax/>
-          <FillValue/>
-        </Element>
+          </Element>
         <Element>
           <Name>y</Name>
           <Qualifier>Component.J</Qualifier>
           <Index>2</Index>
           <ParameterKey>juno_cruise_xyz(1)</ParameterKey>
-          <ValidMin/>
-          <ValidMax/>
-          <FillValue/>
-        </Element>
+          </Element>
         <Element>
           <Name>z</Name>
           <Qualifier>Component.K</Qualifier>
           <Index>3</Index>
           <ParameterKey>juno_cruise_xyz(2)</ParameterKey>
-          <ValidMin/>
-          <ValidMax/>
-          <FillValue/>
-        </Element>
+          </Element>
       </Structure>
       <Support>
         <SupportQuantity>Positional</SupportQuantity>
@@ -107,10 +89,7 @@
     <Parameter>
       <Name>distance juno-sun</Name>
       <ParameterKey>juno_cruise_r</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>AU</Units>
-      <UnitsConversion/>
       <Support>
         <SupportQuantity>Positional</SupportQuantity>
       </Support>
@@ -118,10 +97,7 @@
     <Parameter>
       <Name>lon_iau_sun</Name>
       <ParameterKey>juno_cruise_lon</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>deg</Units>
-      <UnitsConversion/>
       <Support>
         <SupportQuantity>Positional</SupportQuantity>
       </Support>
@@ -129,10 +105,7 @@
     <Parameter>
       <Name>lat_iau_sun</Name>
       <ParameterKey>juno_cruise_lat</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>deg</Units>
-      <UnitsConversion/>
       <Support>
         <SupportQuantity>Positional</SupportQuantity>
       </Support>
diff --git a/NumericalData/CDPP-AMDA/Juno/Ephemeris/juno-ephem-orb1.xml b/NumericalData/CDPP-AMDA/Juno/Ephemeris/juno-ephem-orb1.xml
index 290e669..574b9da 100644
--- a/NumericalData/CDPP-AMDA/Juno/Ephemeris/juno-ephem-orb1.xml
+++ b/NumericalData/CDPP-AMDA/Juno/Ephemeris/juno-ephem-orb1.xml
@@ -7,7 +7,6 @@
       <ResourceName>1 sec@PDS</ResourceName>
       <ReleaseDate>2020-03-06T08:30:52Z</ReleaseDate>
       <Description>Ephemeris extracted from JNO-J-3-FGM-CAL-V1.0 PDS volume</Description>
-      <Acknowledgement/>
       <Contact>
         <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID>
         <Role>PrincipalInvestigator</Role>
@@ -58,14 +57,10 @@
       <Cadence>PT1S</Cadence>
     </TemporalDescription>
     <ObservedRegion>Jupiter</ObservedRegion>
-    <Caveats/>
     <Parameter>
       <Name>distance juno-jup</Name>
       <ParameterKey>juno_eph_orb_r</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>Rj</Units>
-      <UnitsConversion/>
       <Support>
         <SupportQuantity>Positional</SupportQuantity>
       </Support>
@@ -74,9 +69,7 @@
       <Name>xyz_iau_jupiter</Name>
       <ParameterKey>juno_eph_orb_xyz</ParameterKey>
       <Description>Juno position in IAU Jupiter (pc) coordinates</Description>
-      <UCD/>
       <Units>Rj</Units>
-      <UnitsConversion/>
       <Structure>
         <Size>3</Size>
         <Element>
@@ -84,28 +77,19 @@
           <Qualifier>Component.I</Qualifier>
           <Index>1</Index>
           <ParameterKey>juno_eph_orb_xyz(0)</ParameterKey>
-          <ValidMin/>
-          <ValidMax/>
-          <FillValue/>
-        </Element>
+          </Element>
         <Element>
           <Name>y</Name>
           <Qualifier>Component.J</Qualifier>
           <Index>2</Index>
           <ParameterKey>juno_eph_orb_xyz(1)</ParameterKey>
-          <ValidMin/>
-          <ValidMax/>
-          <FillValue/>
-        </Element>
+          </Element>
         <Element>
           <Name>z</Name>
           <Qualifier>Component.K</Qualifier>
           <Index>3</Index>
           <ParameterKey>juno_eph_orb_xyz(2)</ParameterKey>
-          <ValidMin/>
-          <ValidMax/>
-          <FillValue/>
-        </Element>
+          </Element>
       </Structure>
       <Support>
         <SupportQuantity>Positional</SupportQuantity>
@@ -115,7 +99,6 @@
       <Name>xyz_jso</Name>
       <ParameterKey>juno_eph_orb_jso</ParameterKey>
       <Description>Juno position in JSO (ss) coordinates</Description>
-      <UCD/>
       <Units>Rj</Units>
       <UnitsConversion>71.492e6</UnitsConversion>
       <CoordinateSystem>
@@ -129,28 +112,19 @@
           <Qualifier>Component.I</Qualifier>
           <Index>1</Index>
           <ParameterKey>juno_eph_orb_jso(0)</ParameterKey>
-          <ValidMin/>
-          <ValidMax/>
-          <FillValue/>
-        </Element>
+          </Element>
         <Element>
           <Name>y</Name>
           <Qualifier>Component.J</Qualifier>
           <Index>2</Index>
           <ParameterKey>juno_eph_orb_jso(1)</ParameterKey>
-          <ValidMin/>
-          <ValidMax/>
-          <FillValue/>
-        </Element>
+          </Element>
         <Element>
           <Name>z</Name>
           <Qualifier>Component.K</Qualifier>
           <Index>3</Index>
           <ParameterKey>juno_eph_orb_jso(2)</ParameterKey>
-          <ValidMin/>
-          <ValidMax/>
-          <FillValue/>
-        </Element>
+          </Element>
       </Structure>
       <Support>
         <SupportQuantity>Positional</SupportQuantity>
diff --git a/NumericalData/CDPP-AMDA/Juno/Ephemeris/juno-jupiter-all.xml b/NumericalData/CDPP-AMDA/Juno/Ephemeris/juno-jupiter-all.xml
index 5db904c..4be3613 100644
--- a/NumericalData/CDPP-AMDA/Juno/Ephemeris/juno-jupiter-all.xml
+++ b/NumericalData/CDPP-AMDA/Juno/Ephemeris/juno-jupiter-all.xml
@@ -7,7 +7,6 @@
       <ResourceName>5 min@NAIF</ResourceName>
       <ReleaseDate>2020-03-18T01:01:36Z</ReleaseDate>
       <Description>Calculated in IRAP by using Juno SPICE kernels</Description>
-      <Acknowledgement/>
       <Contact>
         <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID>
         <Role>PrincipalInvestigator</Role>
@@ -17,7 +16,6 @@
         <Role>TechnicalContact</Role>
       </Contact>
       <InformationURL>
-        <Name/>
         <URL>              
            </URL>
         <Description>             
@@ -68,14 +66,10 @@
       <Cadence>PT300S</Cadence>
     </TemporalDescription>
     <ObservedRegion>Jupiter</ObservedRegion>
-    <Caveats/>
     <Parameter>
       <Name>xyz_iau_jupiter</Name>
       <ParameterKey>juno_jup_xyz</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>Rj</Units>
-      <UnitsConversion/>
       <Structure>
         <Size>3</Size>
         <Element>
@@ -83,28 +77,19 @@
           <Qualifier>Component.I</Qualifier>
           <Index>1</Index>
           <ParameterKey>juno_jup_xyz(0)</ParameterKey>
-          <ValidMin/>
-          <ValidMax/>
-          <FillValue/>
-        </Element>
+          </Element>
         <Element>
           <Name>y</Name>
           <Qualifier>Component.J</Qualifier>
           <Index>2</Index>
           <ParameterKey>juno_jup_xyz(1)</ParameterKey>
-          <ValidMin/>
-          <ValidMax/>
-          <FillValue/>
-        </Element>
+          </Element>
         <Element>
           <Name>z</Name>
           <Qualifier>Component.K</Qualifier>
           <Index>3</Index>
           <ParameterKey>juno_jup_xyz(2)</ParameterKey>
-          <ValidMin/>
-          <ValidMax/>
-          <FillValue/>
-        </Element>
+          </Element>
       </Structure>
       <Support>
         <SupportQuantity>Positional</SupportQuantity>
@@ -113,10 +98,7 @@
     <Parameter>
       <Name>distance juno-jup</Name>
       <ParameterKey>juno_jup_r</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>Rj</Units>
-      <UnitsConversion/>
       <Support>
         <SupportQuantity>Positional</SupportQuantity>
       </Support>
@@ -124,10 +106,7 @@
     <Parameter>
       <Name>lon_iau_jupiter</Name>
       <ParameterKey>juno_jup_lon</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>deg</Units>
-      <UnitsConversion/>
       <Support>
         <SupportQuantity>Positional</SupportQuantity>
       </Support>
@@ -135,10 +114,7 @@
     <Parameter>
       <Name>lat_iau_jupiter</Name>
       <ParameterKey>juno_jup_lat</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>deg</Units>
-      <UnitsConversion/>
       <Support>
         <SupportQuantity>Positional</SupportQuantity>
       </Support>
@@ -147,9 +123,7 @@
       <Name>mlat</Name>
       <ParameterKey>juno_jup_mlat</ParameterKey>
       <Description>mlat=10.31°xcos(196.61°-lon_iau_west)+lat_iau</Description>
-      <UCD/>
       <Units>deg</Units>
-      <UnitsConversion/>
       <Support>
         <SupportQuantity>Positional</SupportQuantity>
       </Support>
@@ -157,8 +131,6 @@
     <Parameter>
       <Name>xyz_jsm</Name>
       <ParameterKey>juno_jup_jsm</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>Rj</Units>
       <UnitsConversion>71.492e6</UnitsConversion>
       <CoordinateSystem>
@@ -172,28 +144,19 @@
           <Qualifier>Component.I</Qualifier>
           <Index>1</Index>
           <ParameterKey>juno_jup_jsm(0)</ParameterKey>
-          <ValidMin/>
-          <ValidMax/>
-          <FillValue/>
-        </Element>
+          </Element>
         <Element>
           <Name>y</Name>
           <Qualifier>Component.J</Qualifier>
           <Index>2</Index>
           <ParameterKey>juno_jup_jsm(1)</ParameterKey>
-          <ValidMin/>
-          <ValidMax/>
-          <FillValue/>
-        </Element>
+          </Element>
         <Element>
           <Name>z</Name>
           <Qualifier>Component.K</Qualifier>
           <Index>3</Index>
           <ParameterKey>juno_jup_jsm(2)</ParameterKey>
-          <ValidMin/>
-          <ValidMax/>
-          <FillValue/>
-        </Element>
+          </Element>
       </Structure>
       <Support>
         <SupportQuantity>Positional</SupportQuantity>
@@ -202,8 +165,6 @@
     <Parameter>
       <Name>xyz_jso</Name>
       <ParameterKey>juno_jup_jso</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>Rj</Units>
       <UnitsConversion>71.492e6</UnitsConversion>
       <CoordinateSystem>
@@ -217,28 +178,19 @@
           <Qualifier>Component.I</Qualifier>
           <Index>1</Index>
           <ParameterKey>juno_jup_jso(0)</ParameterKey>
-          <ValidMin/>
-          <ValidMax/>
-          <FillValue/>
-        </Element>
+          </Element>
         <Element>
           <Name>y</Name>
           <Qualifier>Component.J</Qualifier>
           <Index>2</Index>
           <ParameterKey>juno_jup_jso(1)</ParameterKey>
-          <ValidMin/>
-          <ValidMax/>
-          <FillValue/>
-        </Element>
+          </Element>
         <Element>
           <Name>z</Name>
           <Qualifier>Component.K</Qualifier>
           <Index>3</Index>
           <ParameterKey>juno_jup_jso(2)</ParameterKey>
-          <ValidMin/>
-          <ValidMax/>
-          <FillValue/>
-        </Element>
+          </Element>
       </Structure>
       <Support>
         <SupportQuantity>Positional</SupportQuantity>
@@ -247,7 +199,6 @@
     <Parameter>
       <Name>juno_orbit_num</Name>
       <ParameterKey>juno_orb_num</ParameterKey>
-      <Units/>
       <RenderingHints>
         <DisplayType>TimeSeries</DisplayType>
       </RenderingHints>
diff --git a/NumericalData/CDPP-AMDA/Juno/Ephemeris/juno-jupiter-all1s.xml b/NumericalData/CDPP-AMDA/Juno/Ephemeris/juno-jupiter-all1s.xml
index de07ecb..00abcf4 100644
--- a/NumericalData/CDPP-AMDA/Juno/Ephemeris/juno-jupiter-all1s.xml
+++ b/NumericalData/CDPP-AMDA/Juno/Ephemeris/juno-jupiter-all1s.xml
@@ -7,7 +7,6 @@
       <ResourceName>1 sec@NAIF</ResourceName>
       <ReleaseDate>2020-03-18T01:01:36Z</ReleaseDate>
       <Description>Calculated in IRAP by using Juno SPICE kernels</Description>
-      <Acknowledgement/>
       <Contact>
         <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID>
         <Role>PrincipalInvestigator</Role>
@@ -17,7 +16,6 @@
         <Role>TechnicalContact</Role>
       </Contact>
       <InformationURL>
-        <Name/>
         <URL>              
            </URL>
         <Description>             
@@ -68,14 +66,10 @@
       <Cadence>PT1S</Cadence>
     </TemporalDescription>
     <ObservedRegion>Jupiter</ObservedRegion>
-    <Caveats/>
     <Parameter>
       <Name>xyz_iau_jupiter</Name>
       <ParameterKey>juno_jup_xyz1s</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>Rj</Units>
-      <UnitsConversion/>
       <Structure>
         <Size>3</Size>
         <Element>
@@ -83,28 +77,19 @@
           <Qualifier>Component.I</Qualifier>
           <Index>1</Index>
           <ParameterKey>juno_jup_xyz1s(0)</ParameterKey>
-          <ValidMin/>
-          <ValidMax/>
-          <FillValue/>
-        </Element>
+          </Element>
         <Element>
           <Name>y</Name>
           <Qualifier>Component.J</Qualifier>
           <Index>2</Index>
           <ParameterKey>juno_jup_xyz1s(1)</ParameterKey>
-          <ValidMin/>
-          <ValidMax/>
-          <FillValue/>
-        </Element>
+          </Element>
         <Element>
           <Name>z</Name>
           <Qualifier>Component.K</Qualifier>
           <Index>3</Index>
           <ParameterKey>juno_jup_xyz1s(2)</ParameterKey>
-          <ValidMin/>
-          <ValidMax/>
-          <FillValue/>
-        </Element>
+          </Element>
       </Structure>
       <Support>
         <SupportQuantity>Positional</SupportQuantity>
@@ -113,10 +98,7 @@
     <Parameter>
       <Name>distance juno-jup</Name>
       <ParameterKey>juno_jup_r1s</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>Rj</Units>
-      <UnitsConversion/>
       <Support>
         <SupportQuantity>Positional</SupportQuantity>
       </Support>
@@ -124,10 +106,7 @@
     <Parameter>
       <Name>lon_iau_jupiter</Name>
       <ParameterKey>juno_jup_lon1s</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>deg</Units>
-      <UnitsConversion/>
       <Support>
         <SupportQuantity>Positional</SupportQuantity>
       </Support>
@@ -135,10 +114,7 @@
     <Parameter>
       <Name>lat_iau_jupiter</Name>
       <ParameterKey>juno_jup_lat1s</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>deg</Units>
-      <UnitsConversion/>
       <Support>
         <SupportQuantity>Positional</SupportQuantity>
       </Support>
@@ -147,9 +123,7 @@
       <Name>mlat</Name>
       <ParameterKey>juno_jup_mlat1s</ParameterKey>
       <Description>mlat=10.31°xcos(196.61°-lon_iau_west)+lat_iau</Description>
-      <UCD/>
       <Units>deg</Units>
-      <UnitsConversion/>
       <Support>
         <SupportQuantity>Positional</SupportQuantity>
       </Support>
@@ -157,8 +131,6 @@
     <Parameter>
       <Name>xyz_jsm</Name>
       <ParameterKey>juno_jup_jsm1s</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>Rj</Units>
       <UnitsConversion>71.492e6</UnitsConversion>
       <CoordinateSystem>
@@ -172,28 +144,19 @@
           <Qualifier>Component.I</Qualifier>
           <Index>1</Index>
           <ParameterKey>juno_jup_jsm1s(0)</ParameterKey>
-          <ValidMin/>
-          <ValidMax/>
-          <FillValue/>
-        </Element>
+          </Element>
         <Element>
           <Name>y</Name>
           <Qualifier>Component.J</Qualifier>
           <Index>2</Index>
           <ParameterKey>juno_jup_jsm1s(1)</ParameterKey>
-          <ValidMin/>
-          <ValidMax/>
-          <FillValue/>
-        </Element>
+          </Element>
         <Element>
           <Name>z</Name>
           <Qualifier>Component.K</Qualifier>
           <Index>3</Index>
           <ParameterKey>juno_jup_jsm1s(2)</ParameterKey>
-          <ValidMin/>
-          <ValidMax/>
-          <FillValue/>
-        </Element>
+          </Element>
       </Structure>
       <Support>
         <SupportQuantity>Positional</SupportQuantity>
@@ -202,8 +165,6 @@
     <Parameter>
       <Name>xyz_jso</Name>
       <ParameterKey>juno_jup_jso1s</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>Rj</Units>
       <UnitsConversion>71.492e6</UnitsConversion>
       <CoordinateSystem>
@@ -217,28 +178,19 @@
           <Qualifier>Component.I</Qualifier>
           <Index>1</Index>
           <ParameterKey>juno_jup_jso1s(0)</ParameterKey>
-          <ValidMin/>
-          <ValidMax/>
-          <FillValue/>
-        </Element>
+          </Element>
         <Element>
           <Name>y</Name>
           <Qualifier>Component.J</Qualifier>
           <Index>2</Index>
           <ParameterKey>juno_jup_jso1s(1)</ParameterKey>
-          <ValidMin/>
-          <ValidMax/>
-          <FillValue/>
-        </Element>
+          </Element>
         <Element>
           <Name>z</Name>
           <Qualifier>Component.K</Qualifier>
           <Index>3</Index>
           <ParameterKey>juno_jup_jso1s(2)</ParameterKey>
-          <ValidMin/>
-          <ValidMax/>
-          <FillValue/>
-        </Element>
+          </Element>
       </Structure>
       <Support>
         <SupportQuantity>Positional</SupportQuantity>
diff --git a/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-cruise60.xml b/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-cruise60.xml
index ad80f54..2249210 100644
--- a/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-cruise60.xml
+++ b/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-cruise60.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <Spase xmlns="http://www.spase-group.org/data/schema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.spase-group.org/data/schema http://www.spase-group.org/data/schema/spase-2.4.1.xsd">
   <Version>2.4.1</Version>
   <NumericalData>
@@ -33,7 +33,7 @@
             <Description>Web Service to this product using the HAPI interface.</Description>
          </AccessURL>
          <Format>CSV</Format>
-         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Donn&#xE9;es de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Universit&#xE9; Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
+         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
       </AccessInformation>
     <AccessInformation>
          <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
@@ -48,7 +48,7 @@
          <Format>VOTable</Format>
          <Format>CDF</Format>
          <Format>PNG</Format>
-         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Donn&#xE9;es de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Universit&#xE9; Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
+         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
       </AccessInformation>
     <ProviderName>PDS</ProviderName>
     <ProviderResourceName>JNO-SS-3-FGM-CAL-V1.0</ProviderResourceName>
diff --git a/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-orb1.xml b/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-orb1.xml
index 0ebf951..1cf75eb 100644
--- a/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-orb1.xml
+++ b/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-orb1.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <Spase xmlns="http://www.spase-group.org/data/schema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.spase-group.org/data/schema http://www.spase-group.org/data/schema/spase-2.4.1.xsd">
   <Version>2.4.1</Version>
   <NumericalData>
@@ -33,7 +33,7 @@
             <Description>Web Service to this product using the HAPI interface.</Description>
          </AccessURL>
          <Format>CSV</Format>
-         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Donn&#xE9;es de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Universit&#xE9; Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
+         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
       </AccessInformation>
     <AccessInformation>
          <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
@@ -48,7 +48,7 @@
          <Format>VOTable</Format>
          <Format>CDF</Format>
          <Format>PNG</Format>
-         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Donn&#xE9;es de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Universit&#xE9; Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
+         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
       </AccessInformation>
     <ProviderName>PDS</ProviderName>
     <ProviderResourceName>JNO-J-3-FGM-CAL-V1.0</ProviderResourceName>
diff --git a/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-orb60.xml b/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-orb60.xml
index 2180739..2509393 100644
--- a/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-orb60.xml
+++ b/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-orb60.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <Spase xmlns="http://www.spase-group.org/data/schema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.spase-group.org/data/schema http://www.spase-group.org/data/schema/spase-2.4.1.xsd">
   <Version>2.4.1</Version>
   <NumericalData>
@@ -33,7 +33,7 @@
             <Description>Web Service to this product using the HAPI interface.</Description>
          </AccessURL>
          <Format>CSV</Format>
-         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Donn&#xE9;es de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Universit&#xE9; Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
+         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
       </AccessInformation>
     <AccessInformation>
          <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
@@ -48,7 +48,7 @@
          <Format>VOTable</Format>
          <Format>CDF</Format>
          <Format>PNG</Format>
-         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Donn&#xE9;es de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Universit&#xE9; Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
+         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
       </AccessInformation>
       <ProviderName>PDS</ProviderName>
       <ProviderResourceName>JNO-J-3-FGM-CAL-V1.0</ProviderResourceName>
diff --git a/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-orbfull.xml b/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-orbfull.xml
index 8873932..7fe0024 100644
--- a/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-orbfull.xml
+++ b/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-orbfull.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <Spase xmlns="http://www.spase-group.org/data/schema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.spase-group.org/data/schema http://www.spase-group.org/data/schema/spase-2.4.1.xsd">
   <Version>2.4.1</Version>
   <NumericalData>
@@ -33,7 +33,7 @@
             <Description>Web Service to this product using the HAPI interface.</Description>
          </AccessURL>
          <Format>CSV</Format>
-         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Donn&#xE9;es de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Universit&#xE9; Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
+         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
       </AccessInformation>
     <AccessInformation>
          <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
@@ -48,7 +48,7 @@
          <Format>VOTable</Format>
          <Format>CDF</Format>
          <Format>PNG</Format>
-         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Donn&#xE9;es de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Universit&#xE9; Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
+         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
       </AccessInformation>
       <ProviderName>PDS</ProviderName>
       <ProviderResourceName>JNO-J-3-FGM-CAL-V1.0</ProviderResourceName>
diff --git a/NumericalData/CDPP-AMDA/Juno/JADE/juno-jade-e060.xml b/NumericalData/CDPP-AMDA/Juno/JADE/juno-jade-e060.xml
index 5a0785d..a4bca36 100644
--- a/NumericalData/CDPP-AMDA/Juno/JADE/juno-jade-e060.xml
+++ b/NumericalData/CDPP-AMDA/Juno/JADE/juno-jade-e060.xml
@@ -5,7 +5,6 @@
     <ResourceID>spase://CNES/NumericalData/CDPP-AMDA/Juno/JADE/juno-jade-e060</ResourceID>
     <ResourceHeader>
       <ResourceName>instrument-60</ResourceName>
-      <AlternateName/>
       <ReleaseDate>2019-09-13T00:39:19Z</ReleaseDate>
       <Description>This data set consists of all of the calibrated flight software version 4 
         (FSW4) data collected by the JADE (Jovian Auroral Plasma Distributions 
@@ -75,14 +74,10 @@
       <CadenceMax>PT4S</CadenceMax>
     </TemporalDescription>
     <ObservedRegion>Jupiter</ObservedRegion>
-    <Caveats/>
     <Parameter>
       <Name>counts/sec</Name>
       <ParameterKey>jade_e60_cps</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>counts per sec</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -97,10 +92,7 @@
     <Parameter>
       <Name>counts/sec - Sum</Name>
       <ParameterKey>jade_e60_cps_sum</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>counts per sec</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -115,10 +107,6 @@
     <Parameter>
       <Name>mode</Name>
       <ParameterKey>jade_e60_mode</ParameterKey>
-      <Description/>
-      <UCD/>
-      <Units/>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>TimeSeries</DisplayType>
       </RenderingHints>
diff --git a/NumericalData/CDPP-AMDA/Juno/JADE/juno-jade-e180.xml b/NumericalData/CDPP-AMDA/Juno/JADE/juno-jade-e180.xml
index ad0596e..1e268fc 100644
--- a/NumericalData/CDPP-AMDA/Juno/JADE/juno-jade-e180.xml
+++ b/NumericalData/CDPP-AMDA/Juno/JADE/juno-jade-e180.xml
@@ -5,7 +5,6 @@
     <ResourceID>spase://CNES/NumericalData/CDPP-AMDA/Juno/JADE/juno-jade-e180</ResourceID>
     <ResourceHeader>
       <ResourceName>instrument-180</ResourceName>
-      <AlternateName/>
       <ReleaseDate>2019-09-13T00:42:01Z</ReleaseDate>
       <Description>This data set consists of all of the calibrated flight software version 4 
         (FSW4) data collected by the JADE (Jovian Auroral Plasma Distributions 
@@ -75,14 +74,10 @@
       <CadenceMax>PT4S</CadenceMax>
     </TemporalDescription>
     <ObservedRegion>Jupiter</ObservedRegion>
-    <Caveats/>
     <Parameter>
       <Name>counts/sec</Name>
       <ParameterKey>jade_e180_cps</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>counts per sec</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -97,10 +92,7 @@
     <Parameter>
       <Name>counts/sec - Sum</Name>
       <ParameterKey>jade_e180_cps_sum</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>counts per sec</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -115,10 +107,6 @@
     <Parameter>
       <Name>mode</Name>
       <ParameterKey>jade_e180_mode</ParameterKey>
-      <Description/>
-      <UCD/>
-      <Units/>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>TimeSeries</DisplayType>
       </RenderingHints>
diff --git a/NumericalData/CDPP-AMDA/Juno/JADE/juno-jade-e300.xml b/NumericalData/CDPP-AMDA/Juno/JADE/juno-jade-e300.xml
index aa000da..3a87a94 100644
--- a/NumericalData/CDPP-AMDA/Juno/JADE/juno-jade-e300.xml
+++ b/NumericalData/CDPP-AMDA/Juno/JADE/juno-jade-e300.xml
@@ -5,7 +5,6 @@
     <ResourceID>spase://CNES/NumericalData/CDPP-AMDA/Juno/JADE/juno-jade-e300</ResourceID>
     <ResourceHeader>
       <ResourceName>instrument-300</ResourceName>
-      <AlternateName/>
       <ReleaseDate>2019-09-13T00:44:54Z</ReleaseDate>
       <Description>This data set consists of all of the calibrated flight software version 4 
         (FSW4) data collected by the JADE (Jovian Auroral Plasma Distributions 
@@ -75,14 +74,10 @@
       <CadenceMax>PT4S</CadenceMax>
     </TemporalDescription>
     <ObservedRegion>Jupiter</ObservedRegion>
-    <Caveats/>
     <Parameter>
       <Name>counts/sec</Name>
       <ParameterKey>jade_e300_cps</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>counts per sec</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -97,10 +92,7 @@
     <Parameter>
       <Name>counts/sec - Sum</Name>
       <ParameterKey>jade_e300_cps_sum</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>counts per sec</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -115,10 +107,6 @@
     <Parameter>
       <Name>mode</Name>
       <ParameterKey>jade_e300_mode</ParameterKey>
-      <Description/>
-      <UCD/>
-      <Units/>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>TimeSeries</DisplayType>
       </RenderingHints>
diff --git a/NumericalData/CDPP-AMDA/Juno/JADE/juno-jade-ions.xml b/NumericalData/CDPP-AMDA/Juno/JADE/juno-jade-ions.xml
index c46bb19..e4183da 100644
--- a/NumericalData/CDPP-AMDA/Juno/JADE/juno-jade-ions.xml
+++ b/NumericalData/CDPP-AMDA/Juno/JADE/juno-jade-ions.xml
@@ -5,7 +5,6 @@
     <ResourceID>spase://CNES/NumericalData/CDPP-AMDA/Juno/JADE/juno-jade-ions</ResourceID>
     <ResourceHeader>
       <ResourceName>species</ResourceName>
-      <AlternateName/>
       <ReleaseDate>2019-09-13T00:46:48Z</ReleaseDate>
       <Description>This data set consists of all of the calibrated flight software version 4 
         (FSW4) data collected by the JADE (Jovian Auroral Plasma Distributions 
@@ -75,14 +74,10 @@
       <CadenceMax>PT4S</CadenceMax>
     </TemporalDescription>
     <ObservedRegion>Jupiter</ObservedRegion>
-    <Caveats/>
     <Parameter>
       <Name>counts/sec</Name>
       <ParameterKey>jade_ispec_cps</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>counts per sec</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -97,10 +92,7 @@
     <Parameter>
       <Name>counts/sec - Sum</Name>
       <ParameterKey>jade_ispec_cps_sum</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>counts per sec</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -115,10 +107,6 @@
     <Parameter>
       <Name>mode</Name>
       <ParameterKey>jade_ispec_mode</ParameterKey>
-      <Description/>
-      <UCD/>
-      <Units/>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>TimeSeries</DisplayType>
       </RenderingHints>
diff --git a/NumericalData/CDPP-AMDA/Juno/JADE/juno-jadel5-e060.xml b/NumericalData/CDPP-AMDA/Juno/JADE/juno-jadel5-e060.xml
index 6a141a7..f02a653 100644
--- a/NumericalData/CDPP-AMDA/Juno/JADE/juno-jadel5-e060.xml
+++ b/NumericalData/CDPP-AMDA/Juno/JADE/juno-jadel5-e060.xml
@@ -5,7 +5,6 @@
     <ResourceID>spase://CNES/NumericalData/CDPP-AMDA/Juno/JADE/juno-jadel5-e060</ResourceID>
     <ResourceHeader>
       <ResourceName>instrument-60</ResourceName>
-      <AlternateName/>
       <ReleaseDate>2019-09-13T00:39:19Z</ReleaseDate>
       <Description>This data set consists of all of the         
         calibrated data collected by the JADE (Jovian Auroral Distributions      
@@ -76,14 +75,10 @@
       <CadenceMax>PT4S</CadenceMax>
     </TemporalDescription>
     <ObservedRegion>Jupiter</ObservedRegion>
-    <Caveats/>
     <Parameter>
       <Name>diff flux</Name>
       <ParameterKey>jade_l5e60_def</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>1/(m^2 sr s)</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -98,10 +93,7 @@
     <Parameter>
       <Name>diff flux - Sum</Name>
       <ParameterKey>jade_l5e60_def_sum</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>1/(m^2 sr s)</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -116,10 +108,7 @@
     <Parameter>
       <Name>diff flux - PAD</Name>
       <ParameterKey>jade_l5e60_def_pad</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>1/(m^2 sr s)</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -134,10 +123,6 @@
     <Parameter>
       <Name>mode</Name>
       <ParameterKey>jade_l5e60_mode</ParameterKey>
-      <Description/>
-      <UCD/>
-      <Units/>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>TimeSeries</DisplayType>
       </RenderingHints>
@@ -148,10 +133,7 @@
     <Parameter>
       <Name>pitch angle</Name>
       <ParameterKey>jade_l5e60_pa</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>deg</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>TimeSeries</DisplayType>
       </RenderingHints>
diff --git a/NumericalData/CDPP-AMDA/Juno/JADE/juno-jadel5-e180.xml b/NumericalData/CDPP-AMDA/Juno/JADE/juno-jadel5-e180.xml
index 6d33827..c3882b1 100644
--- a/NumericalData/CDPP-AMDA/Juno/JADE/juno-jadel5-e180.xml
+++ b/NumericalData/CDPP-AMDA/Juno/JADE/juno-jadel5-e180.xml
@@ -5,7 +5,6 @@
     <ResourceID>spase://CNES/NumericalData/CDPP-AMDA/Juno/JADE/juno-jadel5-e180</ResourceID>
     <ResourceHeader>
       <ResourceName>instrument-180</ResourceName>
-      <AlternateName/>
       <ReleaseDate>2019-09-13T00:42:01Z</ReleaseDate>
       <Description>This data set consists of all of the         
         calibrated data collected by the JADE (Jovian Auroral Distributions      
@@ -76,14 +75,10 @@
       <CadenceMax>PT4S</CadenceMax>
     </TemporalDescription>
     <ObservedRegion>Jupiter</ObservedRegion>
-    <Caveats/>
     <Parameter>
       <Name>diff flux</Name>
       <ParameterKey>jade_l5e180_def</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>1/(m^2 sr s)</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -98,10 +93,7 @@
     <Parameter>
       <Name>diff flux - Sum</Name>
       <ParameterKey>jade_l5e180_def_sum</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>1/(m^2 sr s)</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -116,10 +108,7 @@
     <Parameter>
       <Name>diff flux - PAD</Name>
       <ParameterKey>jade_l5e180_def_pad</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>1/(m^2 sr s)</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -134,10 +123,6 @@
     <Parameter>
       <Name>mode</Name>
       <ParameterKey>jade_l5e180_mode</ParameterKey>
-      <Description/>
-      <UCD/>
-      <Units/>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>TimeSeries</DisplayType>
       </RenderingHints>
@@ -151,10 +136,7 @@
     <Parameter>
       <Name>pitch angle</Name>
       <ParameterKey>jade_l5e180_pa</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>deg</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>TimeSeries</DisplayType>
       </RenderingHints>
diff --git a/NumericalData/CDPP-AMDA/Juno/JADE/juno-jadel5-e300.xml b/NumericalData/CDPP-AMDA/Juno/JADE/juno-jadel5-e300.xml
index 51fed83..4aa9811 100644
--- a/NumericalData/CDPP-AMDA/Juno/JADE/juno-jadel5-e300.xml
+++ b/NumericalData/CDPP-AMDA/Juno/JADE/juno-jadel5-e300.xml
@@ -5,7 +5,6 @@
     <ResourceID>spase://CNES/NumericalData/CDPP-AMDA/Juno/JADE/juno-jadel5-e300</ResourceID>
     <ResourceHeader>
       <ResourceName>instrument-300</ResourceName>
-      <AlternateName/>
       <ReleaseDate>2019-09-13T00:44:54Z</ReleaseDate>
       <Description>This data set consists of all of the         
         calibrated data collected by the JADE (Jovian Auroral Distributions      
@@ -76,14 +75,10 @@
       <CadenceMax>PT4S</CadenceMax>
     </TemporalDescription>
     <ObservedRegion>Jupiter</ObservedRegion>
-    <Caveats/>
     <Parameter>
       <Name>diff flux</Name>
       <ParameterKey>jade_l5e300_def</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>1/(m^2 sr s)</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -98,10 +93,7 @@
     <Parameter>
       <Name>diff flux - Sum</Name>
       <ParameterKey>jade_l5e300_def_sum</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>1/(m^2 sr s)</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -116,10 +108,7 @@
     <Parameter>
       <Name>diff flux - PAD</Name>
       <ParameterKey>jade_l5e300_def_pad</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>1/(m^2 sr s)</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -134,10 +123,6 @@
     <Parameter>
       <Name>mode</Name>
       <ParameterKey>jade_l5e300_mode</ParameterKey>
-      <Description/>
-      <UCD/>
-      <Units/>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>TimeSeries</DisplayType>
       </RenderingHints>
@@ -151,10 +136,7 @@
     <Parameter>
       <Name>pitch angle</Name>
       <ParameterKey>jade_l5e300_pa</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>deg</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>TimeSeries</DisplayType>
       </RenderingHints>
diff --git a/NumericalData/CDPP-AMDA/Juno/JADE/juno-jadel5-elecmom.xml b/NumericalData/CDPP-AMDA/Juno/JADE/juno-jadel5-elecmom.xml
index 9c42757..65ebd42 100644
--- a/NumericalData/CDPP-AMDA/Juno/JADE/juno-jadel5-elecmom.xml
+++ b/NumericalData/CDPP-AMDA/Juno/JADE/juno-jadel5-elecmom.xml
@@ -5,7 +5,6 @@
     <ResourceID>spase://CNES/NumericalData/CDPP-AMDA/Juno/JADE/juno-jadel5-elecmom</ResourceID>
     <ResourceHeader>
       <ResourceName>electrons moments</ResourceName>
-      <AlternateName/>
       <ReleaseDate>2019-09-13T00:46:48Z</ReleaseDate>
       <Description>This data set consists of moments data calculated by the JADE (Jovian Auroral 
         Plasma Distributions Experiment) on-board the Juno spacecraft.
@@ -78,14 +77,11 @@
       <CadenceMax>PT10M</CadenceMax>
     </TemporalDescription>
     <ObservedRegion>Jupiter</ObservedRegion>
-    <Caveats/>
     <Parameter>
       <Name>local time</Name>
       <ParameterKey>jade_elecmom_lt</ParameterKey>
       <Description>Juno's (jovian) Local Time at time UTC</Description>
-      <UCD/>
       <Units>hours</Units>
-      <UnitsConversion/>
       <Support>
         <SupportQuantity>Temporal</SupportQuantity>
       </Support>
@@ -94,9 +90,7 @@
       <Name>density</Name>
       <ParameterKey>jade_elecmom_n</ParameterKey>
       <Description>Number Density</Description>
-      <UCD/>
       <Units>cm**-3</Units>
-      <UnitsConversion/>
       <Particle>
         <ParticleType>Electron</ParticleType>
         <ParticleQuantity>NumberDensity</ParticleQuantity>
@@ -106,9 +100,7 @@
       <Name>density uncertainty</Name>
       <ParameterKey>jade_elecmom_nsigma</ParameterKey>
       <Description>Number Density Uncertainty</Description>
-      <UCD/>
       <Units>cm**-3</Units>
-      <UnitsConversion/>
       <Particle>
         <ParticleType>Electron</ParticleType>
         <ParticleQuantity>NumberDensity</ParticleQuantity>
@@ -118,9 +110,7 @@
       <Name>pressure</Name>
       <ParameterKey>jade_elecmom_p</ParameterKey>
       <Description>Isotropic pressure</Description>
-      <UCD/>
       <Units>Pa</Units>
-      <UnitsConversion/>
       <FillValue>-9.999E+09</FillValue>
       <Particle>
         <ParticleType>Electron</ParticleType>
@@ -131,9 +121,7 @@
       <Name>pressure uncertainty</Name>
       <ParameterKey>jade_elecmom_psigma</ParameterKey>
       <Description>Isotropic pressure uncertainty</Description>
-      <UCD/>
       <Units>Pa</Units>
-      <UnitsConversion/>
       <FillValue>-9.999E+09</FillValue>
       <Particle>
         <ParticleType>Electron</ParticleType>
@@ -144,9 +132,7 @@
       <Name>temperature</Name>
       <ParameterKey>jade_elecmom_t</ParameterKey>
       <Description>Isotropic temperature</Description>
-      <UCD/>
       <Units>eV</Units>
-      <UnitsConversion/>
       <FillValue>-9.999E+09</FillValue>
       <Particle>
         <ParticleType>Electron</ParticleType>
@@ -157,9 +143,7 @@
       <Name>temperature uncertainty</Name>
       <ParameterKey>jade_elecmom_tsigma</ParameterKey>
       <Description>Isotropic temperature</Description>
-      <UCD/>
       <Units>eV</Units>
-      <UnitsConversion/>
       <FillValue>-9.999E+09</FillValue>
       <Particle>
         <ParticleType>Electron</ParticleType>
diff --git a/NumericalData/CDPP-AMDA/Juno/JADE/juno-jadel5-heavmom.xml b/NumericalData/CDPP-AMDA/Juno/JADE/juno-jadel5-heavmom.xml
index 1967fd3..9e53b45 100644
--- a/NumericalData/CDPP-AMDA/Juno/JADE/juno-jadel5-heavmom.xml
+++ b/NumericalData/CDPP-AMDA/Juno/JADE/juno-jadel5-heavmom.xml
@@ -5,7 +5,6 @@
     <ResourceID>spase://CNES/NumericalData/CDPP-AMDA/Juno/JADE/juno-jadel5-heavmom</ResourceID>
     <ResourceHeader>
       <ResourceName>heavies moments</ResourceName>
-      <AlternateName/>
       <ReleaseDate>2019-09-13T00:46:48Z</ReleaseDate>
       <Description>This data set consists of moments data calculated by the JADE (Jovian Auroral 
         Plasma Distributions Experiment) on-board the Juno spacecraft.
@@ -78,14 +77,11 @@
       <CadenceMax>PT10M</CadenceMax>
     </TemporalDescription>
     <ObservedRegion>Jupiter</ObservedRegion>
-    <Caveats/>
     <Parameter>
       <Name>local time</Name>
       <ParameterKey>jade_heavmom_lt</ParameterKey>
       <Description>Juno's (jovian) Local Time at time UTC</Description>
-      <UCD/>
       <Units>hours</Units>
-      <UnitsConversion/>
       <Support>
         <SupportQuantity>Temporal</SupportQuantity>
       </Support>
@@ -94,9 +90,7 @@
       <Name>density</Name>
       <ParameterKey>jade_heavmom_n</ParameterKey>
       <Description>Number Density</Description>
-      <UCD/>
       <Units>cm**-3</Units>
-      <UnitsConversion/>
       <Particle>
         <ParticleType>Ion</ParticleType>
         <ParticleQuantity>NumberDensity</ParticleQuantity>
@@ -106,9 +100,7 @@
       <Name>density uncertainty</Name>
       <ParameterKey>jade_heavmom_nsigma</ParameterKey>
       <Description>Number Density Uncertainty</Description>
-      <UCD/>
       <Units>cm**-3</Units>
-      <UnitsConversion/>
       <Particle>
         <ParticleType>Ion</ParticleType>
         <ParticleQuantity>NumberDensity</ParticleQuantity>
@@ -118,9 +110,7 @@
       <Name>v_jss_xyz</Name>
       <ParameterKey>jade_heavmom_vxyz</ParameterKey>
       <Description>Velocity Vector in the Cartesian JUNO_JSS (Jupiter-deSpun-Sun) frame</Description>
-      <UCD/>
       <Units>km/s</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>TimeSeries</DisplayType>
       </RenderingHints>
@@ -155,9 +145,7 @@
       <Name>v_jss_xyz uncertainty</Name>
       <ParameterKey>jade_heavmom_vxyzsigma</ParameterKey>
       <Description>Velocity Vector uncertainty in the Cartesian JUNO_JSS (Jupiter-deSpun-Sun) frame</Description>
-      <UCD/>
       <Units>km/s</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>TimeSeries</DisplayType>
       </RenderingHints>
@@ -192,9 +180,7 @@
       <Name>v_jss_rtp</Name>
       <ParameterKey>jade_heavmom_vrtp</ParameterKey>
       <Description>Velocity Vector in the spherical JUNO_JSS (Jupiter-deSpun-Sun) frame</Description>
-      <UCD/>
       <Units>km/s</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>TimeSeries</DisplayType>
       </RenderingHints>
@@ -226,9 +212,7 @@
       <Name>v_jss_rtp uncertainty</Name>
       <ParameterKey>jade_heavmom_vrtpsigma</ParameterKey>
       <Description>Velocity Vector uncertainty in the spherical JUNO_JSS (Jupiter-deSpun-Sun) frame</Description>
-      <UCD/>
       <Units>km/s</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>TimeSeries</DisplayType>
       </RenderingHints>
@@ -260,9 +244,7 @@
       <Name>pressure</Name>
       <ParameterKey>jade_heavmom_p</ParameterKey>
       <Description>Isotropic pressure</Description>
-      <UCD/>
       <Units>Pa</Units>
-      <UnitsConversion/>
       <FillValue>-9.999E+09</FillValue>
       <Particle>
         <ParticleType>Ion</ParticleType>
@@ -273,9 +255,7 @@
       <Name>pressure uncertainty</Name>
       <ParameterKey>jade_heavmom_psigma</ParameterKey>
       <Description>Isotropic pressure uncertainty</Description>
-      <UCD/>
       <Units>Pa</Units>
-      <UnitsConversion/>
       <FillValue>-9.999E+09</FillValue>
       <Particle>
         <ParticleType>Ion</ParticleType>
@@ -286,9 +266,7 @@
       <Name>temperature</Name>
       <ParameterKey>jade_heavmom_t</ParameterKey>
       <Description>Isotropic temperature</Description>
-      <UCD/>
       <Units>eV</Units>
-      <UnitsConversion/>
       <FillValue>-9.999E+09</FillValue>
       <Particle>
         <ParticleType>Ion</ParticleType>
@@ -299,9 +277,7 @@
       <Name>temperature uncertainty</Name>
       <ParameterKey>jade_heavmom_tsigma</ParameterKey>
       <Description>Isotropic temperature uncertainty</Description>
-      <UCD/>
       <Units>eV</Units>
-      <UnitsConversion/>
       <FillValue>-9.999E+09</FillValue>
       <Particle>
         <ParticleType>Ion</ParticleType>
diff --git a/NumericalData/CDPP-AMDA/Juno/JADE/juno-jadel5-ions.xml b/NumericalData/CDPP-AMDA/Juno/JADE/juno-jadel5-ions.xml
index 61f64dd..e6eabca 100644
--- a/NumericalData/CDPP-AMDA/Juno/JADE/juno-jadel5-ions.xml
+++ b/NumericalData/CDPP-AMDA/Juno/JADE/juno-jadel5-ions.xml
@@ -5,7 +5,6 @@
     <ResourceID>spase://CNES/NumericalData/CDPP-AMDA/Juno/JADE/juno-jadel5-ions</ResourceID>
     <ResourceHeader>
       <ResourceName>species</ResourceName>
-      <AlternateName/>
       <ReleaseDate>2019-09-13T00:46:48Z</ReleaseDate>
       <Description>This data set consists of all of the         
         calibrated data collected by the JADE (Jovian Auroral Distributions      
@@ -76,14 +75,10 @@
       <CadenceMax>PT4S</CadenceMax>
     </TemporalDescription>
     <ObservedRegion>Jupiter</ObservedRegion>
-    <Caveats/>
     <Parameter>
       <Name>diff E flux</Name>
       <ParameterKey>jade_l5ispec_def</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>1/(m^2 sr s)</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -98,10 +93,7 @@
     <Parameter>
       <Name>diff E flux - Sum</Name>
       <ParameterKey>jade_l5ispec_def_sum</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>1/(m^2 sr s)</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -116,10 +108,6 @@
     <Parameter>
       <Name>mode</Name>
       <ParameterKey>jade_l5ispec_mode</ParameterKey>
-      <Description/>
-      <UCD/>
-      <Units/>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>TimeSeries</DisplayType>
       </RenderingHints>
diff --git a/NumericalData/CDPP-AMDA/Juno/JADE/juno-jadel5-protmom.xml b/NumericalData/CDPP-AMDA/Juno/JADE/juno-jadel5-protmom.xml
index 235d1f5..ecef39e 100644
--- a/NumericalData/CDPP-AMDA/Juno/JADE/juno-jadel5-protmom.xml
+++ b/NumericalData/CDPP-AMDA/Juno/JADE/juno-jadel5-protmom.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Spase xmlns="http://www.spase-group.org/data/schema"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.spase-group.org/data/schema http://www.spase-group.org/data/schema/spase-2.4.1.xsd">
+<Spase xmlns="http://www.spase-group.org/data/schema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.spase-group.org/data/schema http://www.spase-group.org/data/schema/spase-2.4.1.xsd">
   <Version>2.4.1</Version>
   <NumericalData>
     <ResourceID>spase://CNES/NumericalData/CDPP-AMDA/Juno/JADE/juno-jadel5-protmom</ResourceID>
     <ResourceHeader>
       <ResourceName>protons moments</ResourceName>
-      <AlternateName/>
       <ReleaseDate>2019-09-13T00:46:48Z</ReleaseDate>
       <Description>This data set consists of moments data calculated by the JADE (Jovian Auroral 
         Plasma Distributions Experiment) on-board the Juno spacecraft.
@@ -79,14 +77,11 @@
       <CadenceMax>PT10M</CadenceMax>
     </TemporalDescription>
     <ObservedRegion>Jupiter</ObservedRegion>
-    <Caveats/>
     <Parameter>
       <Name>local time</Name>
       <ParameterKey>jade_protmom_lt</ParameterKey>
       <Description>Juno's (jovian) Local Time at time UTC</Description>
-      <UCD/>
       <Units>hours</Units>
-      <UnitsConversion/>
       <Support>
         <SupportQuantity>Temporal</SupportQuantity>
       </Support>
@@ -95,9 +90,7 @@
       <Name>density</Name>
       <ParameterKey>jade_protmom_n</ParameterKey>
       <Description>Number Density</Description>
-      <UCD/>
       <Units>cm**-3</Units>
-      <UnitsConversion/>
       <Particle>
         <ParticleType>Proton</ParticleType>
         <ParticleQuantity>NumberDensity</ParticleQuantity>
@@ -107,9 +100,7 @@
       <Name>density uncertainty</Name>
       <ParameterKey>jade_protmom_nsigma</ParameterKey>
       <Description>Number Density Uncertainty</Description>
-      <UCD/>
       <Units>cm**-3</Units>
-      <UnitsConversion/>
       <Particle>
         <ParticleType>Proton</ParticleType>
         <ParticleQuantity>NumberDensity</ParticleQuantity>
@@ -119,9 +110,7 @@
       <Name>v_jss_xyz</Name>
       <ParameterKey>jade_protmom_vxyz</ParameterKey>
       <Description>Velocity Vector in the Cartesian JUNO_JSS (Jupiter-deSpun-Sun) frame</Description>
-      <UCD/>
       <Units>km/s</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>TimeSeries</DisplayType>
       </RenderingHints>
@@ -156,9 +145,7 @@
       <Name>v_jss_xyz uncertainty</Name>
       <ParameterKey>jade_protmom_vxyzsigma</ParameterKey>
       <Description>Velocity Vector uncertainty in the Cartesian JUNO_JSS (Jupiter-deSpun-Sun) frame</Description>
-      <UCD/>
       <Units>km/s</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>TimeSeries</DisplayType>
       </RenderingHints>
@@ -193,9 +180,7 @@
       <Name>v_jss_rtp</Name>
       <ParameterKey>jade_protmom_vrtp</ParameterKey>
       <Description>Velocity Vector in the spherical JUNO_JSS (Jupiter-deSpun-Sun) frame</Description>
-      <UCD/>
       <Units>km/s</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>TimeSeries</DisplayType>
       </RenderingHints>
@@ -227,9 +212,7 @@
       <Name>v_jss_rtp uncertainty</Name>
       <ParameterKey>jade_protmom_vrtpsigma</ParameterKey>
       <Description>Velocity Vector uncertainty in the spherical JUNO_JSS (Jupiter-deSpun-Sun) frame</Description>
-      <UCD/>
       <Units>km/s</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>TimeSeries</DisplayType>
       </RenderingHints>
@@ -261,9 +244,7 @@
       <Name>pressure</Name>
       <ParameterKey>jade_protmom_p</ParameterKey>
       <Description>Isotropic pressure</Description>
-      <UCD/>
       <Units>Pa</Units>
-      <UnitsConversion/>
       <FillValue>-9.999E+09</FillValue>
       <Particle>
         <ParticleType>Proton</ParticleType>
@@ -274,9 +255,7 @@
       <Name>pressure uncertainty</Name>
       <ParameterKey>jade_protmom_psigma</ParameterKey>
       <Description>Isotropic pressure uncertainty</Description>
-      <UCD/>
       <Units>Pa</Units>
-      <UnitsConversion/>
       <FillValue>-9.999E+09</FillValue>
       <Particle>
         <ParticleType>Proton</ParticleType>
@@ -287,9 +266,7 @@
       <Name>temperature</Name>
       <ParameterKey>jade_protmom_t</ParameterKey>
       <Description>Isotropic temperature</Description>
-      <UCD/>
       <Units>eV</Units>
-      <UnitsConversion/>
       <FillValue>-9.999E+09</FillValue>
       <Particle>
         <ParticleType>Proton</ParticleType>
@@ -300,9 +277,7 @@
       <Name>temperature uncertainty</Name>
       <ParameterKey>jade_protmom_tsigma</ParameterKey>
       <Description>Isotropic temperature uncertainty</Description>
-      <UCD/>
       <Units>eV</Units>
-      <UnitsConversion/>
       <FillValue>-9.999E+09</FillValue>
       <Particle>
         <ParticleType>Proton</ParticleType>
diff --git a/NumericalData/CDPP-AMDA/Juno/JEDI/juno-jedi-e090.xml b/NumericalData/CDPP-AMDA/Juno/JEDI/juno-jedi-e090.xml
index ea4e24e..f0f2945 100644
--- a/NumericalData/CDPP-AMDA/Juno/JEDI/juno-jedi-e090.xml
+++ b/NumericalData/CDPP-AMDA/Juno/JEDI/juno-jedi-e090.xml
@@ -5,7 +5,6 @@
     <ResourceID>spase://CNES/NumericalData/CDPP-AMDA/Juno/JEDI/juno-jedi-e090</ResourceID>
     <ResourceHeader>
       <ResourceName>instrument-90</ResourceName>
-      <AlternateName/>
       <ReleaseDate>2019-09-09T07:40:54Z</ReleaseDate>
       <Description>JUNO JEDI calibrated observations, consisting of energetic particle data collected by the JEDI instruments during the Jupiter Science Orbits phase of the Juno mission.</Description>
       <Contact>
@@ -63,14 +62,10 @@
       <CadenceMax>PT3S</CadenceMax>
     </TemporalDescription>
     <ObservedRegion>Jupiter</ObservedRegion>
-    <Caveats/>
     <Parameter>
       <Name>counts</Name>
       <ParameterKey>jedi_e90_counts</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>counts</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -86,9 +81,7 @@
       <Name>counts - PAD</Name>
       <ParameterKey>jedi_e90_countspad</ParameterKey>
       <Description>Pitch Angle Distribution</Description>
-      <UCD/>
       <Units>counts</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -103,10 +96,7 @@
     <Parameter>
       <Name>diff flux</Name>
       <ParameterKey>jedi_e90_flux</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>counts per sec cm^2 ster keV</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -122,9 +112,7 @@
       <Name>diff flux - PAD</Name>
       <ParameterKey>jedi_e90_fluxpad</ParameterKey>
       <Description>Pitch Angle Distribution</Description>
-      <UCD/>
       <Units>counts per sec cm^2 ster keV</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -139,10 +127,7 @@
     <Parameter>
       <Name>counts/sec</Name>
       <ParameterKey>jedi_e90_cps</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>counts per sec</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -158,9 +143,7 @@
       <Name>counts/sec - PAD</Name>
       <ParameterKey>jedi_e90_cpspad</ParameterKey>
       <Description>Pitch Angle Distribution</Description>
-      <UCD/>
       <Units>counts per sec</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -175,10 +158,6 @@
     <Parameter>
       <Name>mode</Name>
       <ParameterKey>jedi_e90_mode</ParameterKey>
-      <Description/>
-      <UCD/>
-      <Units/>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>TimeSeries</DisplayType>
       </RenderingHints>
@@ -189,10 +168,7 @@
     <Parameter>
       <Name>pitch angle</Name>
       <ParameterKey>jedi_e90_pa</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>deg</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>TimeSeries</DisplayType>
       </RenderingHints>
@@ -236,10 +212,6 @@
     <Parameter>
       <Name>counts SSD</Name>
       <ParameterKey>jedi_e90_ssd</ParameterKey>
-      <Description/>
-      <UCD/>
-      <Units/>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>TimeSeries</DisplayType>
       </RenderingHints>
diff --git a/NumericalData/CDPP-AMDA/Juno/JEDI/juno-jedi-e180.xml b/NumericalData/CDPP-AMDA/Juno/JEDI/juno-jedi-e180.xml
index 129861d..1311f0d 100644
--- a/NumericalData/CDPP-AMDA/Juno/JEDI/juno-jedi-e180.xml
+++ b/NumericalData/CDPP-AMDA/Juno/JEDI/juno-jedi-e180.xml
@@ -5,7 +5,6 @@
     <ResourceID>spase://CNES/NumericalData/CDPP-AMDA/Juno/JEDI/juno-jedi-e180</ResourceID>
     <ResourceHeader>
       <ResourceName>instrument-180</ResourceName>
-      <AlternateName/>
       <ReleaseDate>2019-09-09T07:44:26Z</ReleaseDate>
       <Description>JUNO JEDI calibrated observations, consisting of energetic particle data collected by the JEDI instruments during the Jupiter Science Orbits phase of the Juno mission.</Description>
       <Contact>
@@ -63,14 +62,10 @@
       <CadenceMax>PT3S</CadenceMax>
     </TemporalDescription>
     <ObservedRegion>Jupiter</ObservedRegion>
-    <Caveats/>
     <Parameter>
       <Name>counts</Name>
       <ParameterKey>jedi_e180_counts</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>counts</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -86,9 +81,7 @@
       <Name>counts - PAD</Name>
       <ParameterKey>jedi_e180_countspad</ParameterKey>
       <Description>Pitch Angle Distribution</Description>
-      <UCD/>
       <Units>counts</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -103,10 +96,7 @@
     <Parameter>
       <Name>diff flux</Name>
       <ParameterKey>jedi_e180_flux</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>counts per sec cm^2 ster keV</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -122,9 +112,7 @@
       <Name>diff flux - PAD</Name>
       <ParameterKey>jedi_e180_fluxpad</ParameterKey>
       <Description>Pitch Angle Distribution</Description>
-      <UCD/>
       <Units>counts per sec cm^2 ster keV</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -139,10 +127,7 @@
     <Parameter>
       <Name>counts/sec</Name>
       <ParameterKey>jedi_e180_cps</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>counts per sec</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -158,9 +143,7 @@
       <Name>counts/sec - PAD</Name>
       <ParameterKey>jedi_e180_cpspad</ParameterKey>
       <Description>Pitch Angle Distribution</Description>
-      <UCD/>
       <Units>counts per sec</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -175,10 +158,6 @@
     <Parameter>
       <Name>mode</Name>
       <ParameterKey>jedi_e180_mode</ParameterKey>
-      <Description/>
-      <UCD/>
-      <Units/>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>TimeSeries</DisplayType>
       </RenderingHints>
@@ -192,10 +171,7 @@
     <Parameter>
       <Name>pitch angle</Name>
       <ParameterKey>jedi_e180_pa</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>deg</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>TimeSeries</DisplayType>
       </RenderingHints>
@@ -239,10 +215,6 @@
     <Parameter>
       <Name>counts SSD</Name>
       <ParameterKey>jedi_e180_ssd</ParameterKey>
-      <Description/>
-      <UCD/>
-      <Units/>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>TimeSeries</DisplayType>
       </RenderingHints>
diff --git a/NumericalData/CDPP-AMDA/Juno/JEDI/juno-jedi-e270.xml b/NumericalData/CDPP-AMDA/Juno/JEDI/juno-jedi-e270.xml
index 9d8adc9..4cca41c 100644
--- a/NumericalData/CDPP-AMDA/Juno/JEDI/juno-jedi-e270.xml
+++ b/NumericalData/CDPP-AMDA/Juno/JEDI/juno-jedi-e270.xml
@@ -5,7 +5,6 @@
     <ResourceID>spase://CNES/NumericalData/CDPP-AMDA/Juno/JEDI/juno-jedi-e270</ResourceID>
     <ResourceHeader>
       <ResourceName>instrument-270</ResourceName>
-      <AlternateName/>
       <ReleaseDate>2019-09-09T07:51:04Z</ReleaseDate>
       <Description>JUNO JEDI calibrated observations, consisting of energetic particle data collected by the JEDI instruments during the Jupiter Science Orbits phase of the Juno mission.</Description>
       <Contact>
@@ -63,14 +62,10 @@
       <CadenceMax>PT3S</CadenceMax>
     </TemporalDescription>
     <ObservedRegion>Jupiter</ObservedRegion>
-    <Caveats/>
     <Parameter>
       <Name>counts</Name>
       <ParameterKey>jedi_e270_counts</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>counts</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -86,9 +81,7 @@
       <Name>counts - PAD</Name>
       <ParameterKey>jedi_e270_countspad</ParameterKey>
       <Description>Pitch Angle Distribution</Description>
-      <UCD/>
       <Units>counts</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -103,10 +96,7 @@
     <Parameter>
       <Name>diff flux</Name>
       <ParameterKey>jedi_e270_flux</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>counts per sec cm^2 ster keV</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -122,9 +112,7 @@
       <Name>diff flux - PAD</Name>
       <ParameterKey>jedi_e270_fluxpad</ParameterKey>
       <Description>Pitch Angle Distribution</Description>
-      <UCD/>
       <Units>counts per sec cm^2 ster keV</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -139,10 +127,7 @@
     <Parameter>
       <Name>counts/sec</Name>
       <ParameterKey>jedi_e270_cps</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>counts per sec</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -158,9 +143,7 @@
       <Name>counts/sec - PAD</Name>
       <ParameterKey>jedi_e270_cpspad</ParameterKey>
       <Description>Pitch Angle Distribution</Description>
-      <UCD/>
       <Units>counts per sec</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -175,10 +158,6 @@
     <Parameter>
       <Name>mode</Name>
       <ParameterKey>jedi_e270_mode</ParameterKey>
-      <Description/>
-      <UCD/>
-      <Units/>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>TimeSeries</DisplayType>
       </RenderingHints>
@@ -192,10 +171,7 @@
     <Parameter>
       <Name>pitch angle</Name>
       <ParameterKey>jedi_e270_pa</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>deg</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>TimeSeries</DisplayType>
       </RenderingHints>
@@ -239,10 +215,6 @@
     <Parameter>
       <Name>counts SSD</Name>
       <ParameterKey>jedi_e270_ssd</ParameterKey>
-      <Description/>
-      <UCD/>
-      <Units/>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>TimeSeries</DisplayType>
       </RenderingHints>
diff --git a/NumericalData/CDPP-AMDA/Juno/JEDI/juno-jedi-i090.xml b/NumericalData/CDPP-AMDA/Juno/JEDI/juno-jedi-i090.xml
index 04c880d..47649cd 100644
--- a/NumericalData/CDPP-AMDA/Juno/JEDI/juno-jedi-i090.xml
+++ b/NumericalData/CDPP-AMDA/Juno/JEDI/juno-jedi-i090.xml
@@ -5,7 +5,6 @@
     <ResourceID>spase://CNES/NumericalData/CDPP-AMDA/Juno/JEDI/juno-jedi-i090</ResourceID>
     <ResourceHeader>
       <ResourceName>instrument-90</ResourceName>
-      <AlternateName/>
       <ReleaseDate>2019-09-09T07:55:28Z</ReleaseDate>
       <Description>JUNO JEDI calibrated observations, consisting of energetic particle data collected by the JEDI instruments during the Jupiter Science Orbits phase of the Juno mission.</Description>
       <Contact>
@@ -63,14 +62,10 @@
       <CadenceMax>PT3S</CadenceMax>
     </TemporalDescription>
     <ObservedRegion>Jupiter</ObservedRegion>
-    <Caveats/>
     <Parameter>
       <Name>counts</Name>
       <ParameterKey>jedi_i90_counts</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>counts</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -86,9 +81,7 @@
       <Name>counts - PAD</Name>
       <ParameterKey>jedi_i90_countspad</ParameterKey>
       <Description>Pitch Angle Distribution</Description>
-      <UCD/>
       <Units>counts</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -103,10 +96,7 @@
     <Parameter>
       <Name>diff flux</Name>
       <ParameterKey>jedi_i90_flux</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>counts per sec cm^2 ster keV</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -122,9 +112,7 @@
       <Name>diff flux - PAD</Name>
       <ParameterKey>jedi_i90_fluxpad</ParameterKey>
       <Description>Pitch Angle Distribution</Description>
-      <UCD/>
       <Units>counts per sec cm^2 ster keV</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -139,10 +127,7 @@
     <Parameter>
       <Name>counts/sec</Name>
       <ParameterKey>jedi_i90_cps</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>counts per sec</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -158,9 +143,7 @@
       <Name>counts/sec - PAD</Name>
       <ParameterKey>jedi_i90_cpspad</ParameterKey>
       <Description>Pitch Angle Distribution</Description>
-      <UCD/>
       <Units>counts per sec</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -175,10 +158,6 @@
     <Parameter>
       <Name>mode</Name>
       <ParameterKey>jedi_i90_mode</ParameterKey>
-      <Description/>
-      <UCD/>
-      <Units/>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>TimeSeries</DisplayType>
       </RenderingHints>
@@ -192,10 +171,7 @@
     <Parameter>
       <Name>pitch angle</Name>
       <ParameterKey>jedi_i90_pa</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>deg</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>TimeSeries</DisplayType>
       </RenderingHints>
@@ -239,10 +215,6 @@
     <Parameter>
       <Name>counts SSD</Name>
       <ParameterKey>jedi_i90_ssd</ParameterKey>
-      <Description/>
-      <UCD/>
-      <Units/>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>TimeSeries</DisplayType>
       </RenderingHints>
diff --git a/NumericalData/CDPP-AMDA/Juno/JEDI/juno-jedi-i180.xml b/NumericalData/CDPP-AMDA/Juno/JEDI/juno-jedi-i180.xml
index ca90d49..a8f272f 100644
--- a/NumericalData/CDPP-AMDA/Juno/JEDI/juno-jedi-i180.xml
+++ b/NumericalData/CDPP-AMDA/Juno/JEDI/juno-jedi-i180.xml
@@ -5,7 +5,6 @@
     <ResourceID>spase://CNES/NumericalData/CDPP-AMDA/Juno/JEDI/juno-jedi-i180</ResourceID>
     <ResourceHeader>
       <ResourceName>instrument-180</ResourceName>
-      <AlternateName/>
       <ReleaseDate>2019-09-09T07:58:13Z</ReleaseDate>
       <Description>JUNO JEDI calibrated observations, consisting of energetic particle data collected by the JEDI instruments during the Jupiter Science Orbits phase of the Juno mission.</Description>
       <Contact>
@@ -63,14 +62,10 @@
       <CadenceMax>PT3S</CadenceMax>
     </TemporalDescription>
     <ObservedRegion>Jupiter</ObservedRegion>
-    <Caveats/>
     <Parameter>
       <Name>counts</Name>
       <ParameterKey>jedi_i180_counts</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>counts</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -86,9 +81,7 @@
       <Name>counts - PAD</Name>
       <ParameterKey>jedi_i180_countspad</ParameterKey>
       <Description>Pitch Angle Distribution</Description>
-      <UCD/>
       <Units>counts</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -103,10 +96,7 @@
     <Parameter>
       <Name>diff flux</Name>
       <ParameterKey>jedi_i180_flux</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>counts per sec cm^2 ster keV</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -122,9 +112,7 @@
       <Name>diff flux - PAD</Name>
       <ParameterKey>jedi_i180_fluxpad</ParameterKey>
       <Description>Pitch Angle Distribution</Description>
-      <UCD/>
       <Units>counts per sec cm^2 ster keV</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -139,10 +127,7 @@
     <Parameter>
       <Name>counts/sec</Name>
       <ParameterKey>jedi_i180_cps</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>counts per sec</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -158,9 +143,7 @@
       <Name>counts/sec - PAD</Name>
       <ParameterKey>jedi_i180_cpspad</ParameterKey>
       <Description>Pitch Angle Distribution</Description>
-      <UCD/>
       <Units>counts per sec</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -175,10 +158,6 @@
     <Parameter>
       <Name>mode</Name>
       <ParameterKey>jedi_i180_mode</ParameterKey>
-      <Description/>
-      <UCD/>
-      <Units/>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>TimeSeries</DisplayType>
       </RenderingHints>
@@ -192,10 +171,7 @@
     <Parameter>
       <Name>pitch angle</Name>
       <ParameterKey>jedi_i180_pa</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>deg</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>TimeSeries</DisplayType>
       </RenderingHints>
@@ -239,10 +215,6 @@
     <Parameter>
       <Name>counts SSD</Name>
       <ParameterKey>jedi_i180_ssd</ParameterKey>
-      <Description/>
-      <UCD/>
-      <Units/>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>TimeSeries</DisplayType>
       </RenderingHints>
diff --git a/NumericalData/CDPP-AMDA/Juno/JEDI/juno-jedi-i270.xml b/NumericalData/CDPP-AMDA/Juno/JEDI/juno-jedi-i270.xml
index 089fc34..785a509 100644
--- a/NumericalData/CDPP-AMDA/Juno/JEDI/juno-jedi-i270.xml
+++ b/NumericalData/CDPP-AMDA/Juno/JEDI/juno-jedi-i270.xml
@@ -5,7 +5,6 @@
     <ResourceID>spase://CNES/NumericalData/CDPP-AMDA/Juno/JEDI/juno-jedi-i270</ResourceID>
     <ResourceHeader>
       <ResourceName>instrument-270</ResourceName>
-      <AlternateName/>
       <ReleaseDate>2019-09-09T08:03:19Z</ReleaseDate>
       <Description>JUNO JEDI calibrated observations, consisting of energetic particle data collected by the JEDI instruments during the Jupiter Science Orbits phase of the Juno mission.</Description>
       <Contact>
@@ -63,14 +62,10 @@
       <CadenceMax>PT3S</CadenceMax>
     </TemporalDescription>
     <ObservedRegion>Jupiter</ObservedRegion>
-    <Caveats/>
     <Parameter>
       <Name>counts</Name>
       <ParameterKey>jedi_i270_counts</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>counts</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -86,9 +81,7 @@
       <Name>counts - PAD</Name>
       <ParameterKey>jedi_i270_countspad</ParameterKey>
       <Description>Pitch Angle Distribution</Description>
-      <UCD/>
       <Units>counts</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -103,10 +96,7 @@
     <Parameter>
       <Name>diff flux</Name>
       <ParameterKey>jedi_i270_flux</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>counts per sec cm^2 ster keV</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -122,9 +112,7 @@
       <Name>diff flux - PAD</Name>
       <ParameterKey>jedi_i270_fluxpad</ParameterKey>
       <Description>Pitch Angle Distribution</Description>
-      <UCD/>
       <Units>counts per sec cm^2 ster keV</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -139,10 +127,7 @@
     <Parameter>
       <Name>counts/sec</Name>
       <ParameterKey>jedi_i270_cps</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>counts per sec</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -158,9 +143,7 @@
       <Name>counts/sec - PAD</Name>
       <ParameterKey>jedi_i270_cpspad</ParameterKey>
       <Description>Pitch Angle Distribution</Description>
-      <UCD/>
       <Units>counts per sec</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -175,10 +158,6 @@
     <Parameter>
       <Name>mode</Name>
       <ParameterKey>jedi_i270_mode</ParameterKey>
-      <Description/>
-      <UCD/>
-      <Units/>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>TimeSeries</DisplayType>
       </RenderingHints>
@@ -192,10 +171,7 @@
     <Parameter>
       <Name>pitch angle</Name>
       <ParameterKey>jedi_i270_pa</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>deg</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>TimeSeries</DisplayType>
       </RenderingHints>
@@ -239,10 +215,6 @@
     <Parameter>
       <Name>counts SSD</Name>
       <ParameterKey>jedi_i270_ssd</ParameterKey>
-      <Description/>
-      <UCD/>
-      <Units/>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>TimeSeries</DisplayType>
       </RenderingHints>
diff --git a/NumericalData/CDPP-AMDA/Juno/WAVES/juno-wav-crub.xml b/NumericalData/CDPP-AMDA/Juno/WAVES/juno-wav-crub.xml
index 9dc0c51..72c0757 100644
--- a/NumericalData/CDPP-AMDA/Juno/WAVES/juno-wav-crub.xml
+++ b/NumericalData/CDPP-AMDA/Juno/WAVES/juno-wav-crub.xml
@@ -5,7 +5,6 @@
     <ResourceID>spase://CNES/NumericalData/CDPP-AMDA/Juno/WAVES/juno-wav-crub</ResourceID>
     <ResourceHeader>
       <ResourceName>Magnetic Field</ResourceName>
-      <AlternateName/>
       <ReleaseDate>2017-12-18T12:19:37Z</ReleaseDate>
       <Description>Waves instrument Survey science data records for the cruise phase of Juno mission. Data provided on this 
         volume are at the highest available time and frequency resolution and have been calibrated into physical units using the best calibration tables 
@@ -66,14 +65,10 @@
       <CadenceMax>PT10S</CadenceMax>
     </TemporalDescription>
     <ObservedRegion>Jupiter</ObservedRegion>
-    <Caveats/>
     <Parameter>
       <Name>b_lfrlo</Name>
       <ParameterKey>juno_wav_b_cru_lfrlo</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>(nT**2)/Hz</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
diff --git a/NumericalData/CDPP-AMDA/Juno/WAVES/juno-wav-crue.xml b/NumericalData/CDPP-AMDA/Juno/WAVES/juno-wav-crue.xml
index 937d822..81f66d9 100644
--- a/NumericalData/CDPP-AMDA/Juno/WAVES/juno-wav-crue.xml
+++ b/NumericalData/CDPP-AMDA/Juno/WAVES/juno-wav-crue.xml
@@ -5,7 +5,6 @@
     <ResourceID>spase://CNES/NumericalData/CDPP-AMDA/Juno/WAVES/juno-wav-crue</ResourceID>
     <ResourceHeader>
       <ResourceName>Electric Field</ResourceName>
-      <AlternateName/>
       <ReleaseDate>2017-12-18T12:35:49Z</ReleaseDate>
       <Description>Waves instrument Survey science data records for the cruise phase of Juno mission. Data provided on this 
         volume are at the highest available time and frequency resolution and have been calibrated into physical units using the best calibration tables 
@@ -66,14 +65,10 @@
       <CadenceMax>PT10S</CadenceMax>
     </TemporalDescription>
     <ObservedRegion>Jupiter</ObservedRegion>
-    <Caveats/>
     <Parameter>
       <Name>e_lfrlo</Name>
       <ParameterKey>juno_wav_e_cru_lfrlo</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>(V**2/m**2)/Hz</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -88,10 +83,7 @@
     <Parameter>
       <Name>e_lfrhi</Name>
       <ParameterKey>juno_wav_e_cru_lfrhi</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>(V**2/m**2)/Hz</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -106,10 +98,7 @@
     <Parameter>
       <Name>e_hfrlo</Name>
       <ParameterKey>juno_wav_e_cru_hfrlo</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>(V**2/m**2)/Hz</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -124,10 +113,7 @@
     <Parameter>
       <Name>e_hfrhi</Name>
       <ParameterKey>juno_wav_e_cru_hfrhi</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>(V**2/m**2)/Hz</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
diff --git a/NumericalData/CDPP-AMDA/Juno/WAVES/juno-wav-l3f.xml b/NumericalData/CDPP-AMDA/Juno/WAVES/juno-wav-l3f.xml
index d951e2c..8f402d1 100644
--- a/NumericalData/CDPP-AMDA/Juno/WAVES/juno-wav-l3f.xml
+++ b/NumericalData/CDPP-AMDA/Juno/WAVES/juno-wav-l3f.xml
@@ -5,7 +5,6 @@
     <ResourceID>spase://CNES/NumericalData/CDPP-AMDA/Juno/WAVES/juno-wav-l3f</ResourceID>
     <ResourceHeader>
       <ResourceName>calibrated electric flux density</ResourceName>
-      <AlternateName/>
       <ReleaseDate>2023-06-20T08:38:01Z</ReleaseDate>
       <Description>This datasets contain the Juno/Waves estimated electric flux density based on Cassini/RPWS measurements at Jupiter.</Description>
       <Acknowledgement>The MASER Juno/Waves CDR collection has been calculated by C. Louis, P. Zarka, K. Dabidin, P.-A. Lampson, F. Magalhaes, A. Boudouma, M. Marques and B. Cecconi. The authors acknowledge the Observatoire de Paris, CNES, CNRS for funding and supporting this work and B. Kurth and the University of Iowa and the Juno/Waves team for providing access to the Juno/Waves data accessible online from PDS at https://doi.org/10.17189/1519708. The authors thank J. Faden and C. Piker for their work on the Autoplot software.
@@ -23,13 +22,11 @@ BC was also supported by PADC and EPN2024-RI. The Europlanet 2024 Research Infra
       <InformationURL>
         <Name>C. K. Louis, P. Zarka and B. Cecconi (2021). Juno/Waves estimated flux density Collection (Version 1.0) [Data set]. PADC</Name>
         <URL>https://doi.org/10.25935/6jg4-mk86</URL>
-        <Description/>
-      </InformationURL>
+        </InformationURL>
       <InformationURL>
         <Name>Louis, C. K., Zarka, P., Dabidin, K., Lampson, P.-A., Magalhães, F. P., Boudouma, A., et al. (2021). Latitudinal beaming of Jupiter’s radio emissions from Juno/Waves flux density measurements. Journal of Geophysical Research: Space Physics, 126, e2021JA029435, doi: 10.1029/2021JA029435</Name>
         <URL>https://doi.org/10.1029/2021JA029435</URL>
-        <Description/>
-      </InformationURL>
+        </InformationURL>
       <Association>
         <AssociationID>juno-wav-orb</AssociationID>
         <AssociationType>PartOf</AssociationType>
@@ -65,7 +62,6 @@ BC was also supported by PADC and EPN2024-RI. The Europlanet 2024 Research Infra
          <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
       </AccessInformation>
     <ProviderName>PADC/MASER</ProviderName>
-    <ProviderResourceName/>
     <InstrumentID>spase://CNES/Instrument/CDPP-AMDA/Juno/WAVES</InstrumentID>
     <MeasurementType>Waves</MeasurementType>
     <TemporalDescription>
@@ -76,14 +72,10 @@ BC was also supported by PADC and EPN2024-RI. The Europlanet 2024 Research Infra
       <Cadence>PT1S</Cadence>
     </TemporalDescription>
     <ObservedRegion>Jupiter</ObservedRegion>
-    <Caveats/>
     <Parameter>
       <Name>density_flux</Name>
       <ParameterKey>juno_wav_l3f</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>(V**2/m**2)/Hz</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -96,4 +88,4 @@ BC was also supported by PADC and EPN2024-RI. The Europlanet 2024 Research Infra
       </Wave>
     </Parameter>
   </NumericalData>
-</Spase>
\ No newline at end of file
+</Spase>
diff --git a/NumericalData/CDPP-AMDA/Juno/WAVES/juno-wav-orbb.xml b/NumericalData/CDPP-AMDA/Juno/WAVES/juno-wav-orbb.xml
index 27146b7..166fbf9 100644
--- a/NumericalData/CDPP-AMDA/Juno/WAVES/juno-wav-orbb.xml
+++ b/NumericalData/CDPP-AMDA/Juno/WAVES/juno-wav-orbb.xml
@@ -5,7 +5,6 @@
     <ResourceID>spase://CNES/NumericalData/CDPP-AMDA/Juno/WAVES/juno-wav-orbb</ResourceID>
     <ResourceHeader>
       <ResourceName>b spectral density</ResourceName>
-      <AlternateName/>
       <ReleaseDate>2019-09-10T08:36:34Z</ReleaseDate>
       <Description>Waves instrument Survey science data records for the orbital phase of Juno mission. Data provided on this 
         volume are at the highest available time and frequency resolution and have been calibrated into physical units using the best calibration tables 
@@ -66,14 +65,10 @@
       <CadenceMax>PT10S</CadenceMax>
     </TemporalDescription>
     <ObservedRegion>Jupiter</ObservedRegion>
-    <Caveats/>
     <Parameter>
       <Name>b_lfrlo</Name>
       <ParameterKey>juno_wav_b_orb_lfrlo</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>(nT**2)/Hz</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
diff --git a/NumericalData/CDPP-AMDA/Juno/WAVES/juno-wav-orbe.xml b/NumericalData/CDPP-AMDA/Juno/WAVES/juno-wav-orbe.xml
index 5acfbe9..daa26c7 100644
--- a/NumericalData/CDPP-AMDA/Juno/WAVES/juno-wav-orbe.xml
+++ b/NumericalData/CDPP-AMDA/Juno/WAVES/juno-wav-orbe.xml
@@ -5,7 +5,6 @@
     <ResourceID>spase://CNES/NumericalData/CDPP-AMDA/Juno/WAVES/juno-wav-orbe</ResourceID>
     <ResourceHeader>
       <ResourceName>e spectral density</ResourceName>
-      <AlternateName/>
       <ReleaseDate>2019-09-10T08:38:01Z</ReleaseDate>
       <Description>Waves instrument Survey science data records for the orbital phase of Juno mission. Data provided on this 
         volume are at the highest available time and frequency resolution and have been calibrated into physical units using the best calibration tables 
@@ -66,14 +65,10 @@
       <CadenceMax>PT10S</CadenceMax>
     </TemporalDescription>
     <ObservedRegion>Jupiter</ObservedRegion>
-    <Caveats/>
     <Parameter>
       <Name>e_lfrlo</Name>
       <ParameterKey>juno_wav_e_orb_lfrlo</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>(V**2/m**2)/Hz</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -88,10 +83,7 @@
     <Parameter>
       <Name>e_lfrhi</Name>
       <ParameterKey>juno_wav_e_orb_lfrhi</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>(V**2/m**2)/Hz</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -106,10 +98,7 @@
     <Parameter>
       <Name>e_hfrlo</Name>
       <ParameterKey>juno_wav_e_orb_hfrlo</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>(V**2/m**2)/Hz</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
@@ -124,10 +113,7 @@
     <Parameter>
       <Name>e_hfrhi</Name>
       <ParameterKey>juno_wav_e_orb_hfrhi</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>(V**2/m**2)/Hz</Units>
-      <UnitsConversion/>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
       </RenderingHints>
diff --git a/NumericalData/CDPP-AMDA/MESSENGER/Models/mes-kt17-model.xml b/NumericalData/CDPP-AMDA/MESSENGER/Models/mes-kt17-model.xml
index e514437..47862ba 100644
--- a/NumericalData/CDPP-AMDA/MESSENGER/Models/mes-kt17-model.xml
+++ b/NumericalData/CDPP-AMDA/MESSENGER/Models/mes-kt17-model.xml
@@ -77,11 +77,9 @@
       <Cadence>PT1M</Cadence>
     </TemporalDescription>
     <ObservedRegion>Mercury</ObservedRegion>
-    <Caveats/>
     <Parameter>
       <Name>b msm</Name>
       <ParameterKey>b_kt17_model_60_0.427_50_mes_xyz_orbmso</ParameterKey>
-      <Description/>
       <Units>nT</Units>
       <Structure>
         <Size>3</Size>
@@ -90,26 +88,19 @@
           <Qualifier>Component.I</Qualifier>
           <Index>1</Index>
           <ParameterKey>b_kt17_model_60_0.427_50_mes_xyz_orbmso(0)</ParameterKey>
-          <ValidMin/>
-          <ValidMax/>
-        </Element>
+          </Element>
         <Element>
           <Name>by</Name>
           <Qualifier>Component.J</Qualifier>
           <Index>2</Index>
           <ParameterKey>b_kt17_model_60_0.427_50_mes_xyz_orbmso(1)</ParameterKey>
-          <ValidMin/>
-          <ValidMax/>
-        </Element>
+          </Element>
         <Element>
           <Name>bz</Name>
           <Qualifier>Component.K</Qualifier>
           <Index>3</Index>
           <ParameterKey>b_kt17_model_60_0.427_50_mes_xyz_orbmso(2)</ParameterKey>
-          <ValidMin/>
-          <ValidMax/>
-          <FillValue/>
-        </Element>
+          </Element>
       </Structure>
       <Field>
         <FieldQuantity>Magnetic</FieldQuantity>
diff --git a/NumericalData/CDPP-AMDA/MESSENGER/Models/mes-kt17-pds.xml b/NumericalData/CDPP-AMDA/MESSENGER/Models/mes-kt17-pds.xml
index d8c56e2..4ecbc2c 100644
--- a/NumericalData/CDPP-AMDA/MESSENGER/Models/mes-kt17-pds.xml
+++ b/NumericalData/CDPP-AMDA/MESSENGER/Models/mes-kt17-pds.xml
@@ -61,14 +61,10 @@
       <Cadence>PT1M</Cadence>
     </TemporalDescription>
     <ObservedRegion>Mercury</ObservedRegion>
-    <Caveats/>
     <Parameter>
       <Name>b_mso internal</Name>
       <ParameterKey>b_kt17_internal</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>nT</Units>
-      <UnitsConversion/>
       <Structure>
         <Size>3</Size>
         <Element>
@@ -97,8 +93,6 @@
     <Parameter>
       <Name>|b| internal</Name>
       <ParameterKey>b_kt17_internal_tot</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>nT</Units>
       <Field>
         <FieldQuantity>Magnetic</FieldQuantity>
@@ -107,10 +101,7 @@
     <Parameter>
       <Name>b_mso external</Name>
       <ParameterKey>b_kt17_external</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>nT</Units>
-      <UnitsConversion/>
       <Structure>
         <Size>3</Size>
         <Element>
@@ -139,8 +130,6 @@
     <Parameter>
       <Name>|b| external</Name>
       <ParameterKey>b_kt17_external_tot</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>nT</Units>
       <Field>
         <FieldQuantity>Magnetic</FieldQuantity>
@@ -149,10 +138,7 @@
     <Parameter>
       <Name>b_mso all</Name>
       <ParameterKey>b_kt17_all</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>nT</Units>
-      <UnitsConversion/>
       <Structure>
         <Size>3</Size>
         <Element>
@@ -181,8 +167,6 @@
     <Parameter>
       <Name>|b| all</Name>
       <ParameterKey>b_kt17_all_tot</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>nT</Units>
       <Field>
         <FieldQuantity>Magnetic</FieldQuantity>
@@ -191,8 +175,6 @@
     <Parameter>
       <Name>distance mercury-sun</Name>
       <ParameterKey>b_kt17_rhel</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>nT</Units>
       <Field>
         <FieldQuantity>Magnetic</FieldQuantity>
@@ -201,8 +183,6 @@
     <Parameter>
       <Name>disturbance index</Name>
       <ParameterKey>b_kt17_actIdx</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>nT</Units>
       <Field>
         <FieldQuantity>Magnetic</FieldQuantity>
diff --git a/NumericalData/CDPP-AMDA/Mariner10/Models/m10-kt17-model.xml b/NumericalData/CDPP-AMDA/Mariner10/Models/m10-kt17-model.xml
index 79c20c1..4fb2c29 100644
--- a/NumericalData/CDPP-AMDA/Mariner10/Models/m10-kt17-model.xml
+++ b/NumericalData/CDPP-AMDA/Mariner10/Models/m10-kt17-model.xml
@@ -77,11 +77,9 @@
       <Cadence>PT1M</Cadence>
     </TemporalDescription>
     <ObservedRegion>Mercury</ObservedRegion>
-    <Caveats/>
     <Parameter>
       <Name>b msm</Name>
       <ParameterKey>b_kt17_model_60_0.427_50_m10_m1_xyz_mso</ParameterKey>
-      <Description/>
       <Units>nT</Units>
       <Structure>
         <Size>3</Size>
@@ -90,26 +88,19 @@
           <Qualifier>Component.I</Qualifier>
           <Index>1</Index>
           <ParameterKey>b_kt17_model_60_0.427_50_m10_m1_xyz_mso(0)</ParameterKey>
-          <ValidMin/>
-          <ValidMax/>
-        </Element>
+          </Element>
         <Element>
           <Name>by</Name>
           <Qualifier>Component.J</Qualifier>
           <Index>2</Index>
           <ParameterKey>b_kt17_model_60_0.427_50_m10_m1_xyz_mso(1)</ParameterKey>
-          <ValidMin/>
-          <ValidMax/>
-        </Element>
+          </Element>
         <Element>
           <Name>bz</Name>
           <Qualifier>Component.K</Qualifier>
           <Index>3</Index>
           <ParameterKey>b_kt17_model_60_0.427_50_m10_m1_xyz_mso(2)</ParameterKey>
-          <ValidMin/>
-          <ValidMax/>
-          <FillValue/>
-        </Element>
+          </Element>
       </Structure>
       <Field>
         <FieldQuantity>Magnetic</FieldQuantity>
diff --git a/NumericalData/CDPP-AMDA/OMNI/omni-1min-v2.xml b/NumericalData/CDPP-AMDA/OMNI/omni-1min-v2.xml
index 68475e5..c2f3299 100644
--- a/NumericalData/CDPP-AMDA/OMNI/omni-1min-v2.xml
+++ b/NumericalData/CDPP-AMDA/OMNI/omni-1min-v2.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <Spase xmlns="http://www.spase-group.org/data/schema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.spase-group.org/data/schema http://www.spase-group.org/data/schema/spase-2.4.1.xsd">
   <Version>2.4.1</Version>
   <NumericalData>
@@ -41,7 +41,7 @@ for creating the OMNI data set.</Acknowledgement>
             <Description>Web Service to this product using the HAPI interface.</Description>
          </AccessURL>
          <Format>CSV</Format>
-         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Donn&#xE9;es de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Universit&#xE9; Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
+         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
       </AccessInformation>
     <AccessInformation>
          <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
@@ -56,7 +56,7 @@ for creating the OMNI data set.</Acknowledgement>
          <Format>VOTable</Format>
          <Format>CDF</Format>
          <Format>PNG</Format>
-         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Donn&#xE9;es de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Universit&#xE9; Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
+         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
       </AccessInformation>
     <ProcessingLevel>Calibrated</ProcessingLevel>
     <ProviderName>CDAWeb</ProviderName>
@@ -329,4 +329,4 @@ for creating the OMNI data set.</Acknowledgement>
       </Support>
     </Parameter>    
   </NumericalData>
-</Spase>
\ No newline at end of file
+</Spase>
diff --git a/NumericalData/CDPP-AMDA/OMNI/omni-5min-v2.xml b/NumericalData/CDPP-AMDA/OMNI/omni-5min-v2.xml
index d11c610..05075c9 100644
--- a/NumericalData/CDPP-AMDA/OMNI/omni-5min-v2.xml
+++ b/NumericalData/CDPP-AMDA/OMNI/omni-5min-v2.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <Spase xmlns="http://www.spase-group.org/data/schema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.spase-group.org/data/schema http://www.spase-group.org/data/schema/spase-2.4.1.xsd">
   <Version>2.4.1</Version>
   <NumericalData>
@@ -39,7 +39,7 @@ for creating the OMNI data set.</Acknowledgement>
             <Description>Web Service to this product using the HAPI interface.</Description>
          </AccessURL>
          <Format>CSV</Format>
-         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Donn&#xE9;es de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Universit&#xE9; Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
+         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
       </AccessInformation>
     <AccessInformation>
          <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
@@ -54,7 +54,7 @@ for creating the OMNI data set.</Acknowledgement>
          <Format>VOTable</Format>
          <Format>CDF</Format>
          <Format>PNG</Format>
-         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Donn&#xE9;es de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Universit&#xE9; Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
+         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
       </AccessInformation>
     <ProcessingLevel>Calibrated</ProcessingLevel>
     <ProviderName>CDAWeb</ProviderName>
@@ -75,7 +75,6 @@ for creating the OMNI data set.</Acknowledgement>
     <Parameter>
       <Name>|b|</Name>
       <ParameterKey>omni_hro2_5min_mag</ParameterKey>
-      <Description/>
       <UCD>phys.magField</UCD>
       <Units>nT</Units>
       <RenderingHints>
@@ -89,7 +88,6 @@ for creating the OMNI data set.</Acknowledgement>
     <Parameter>
       <Name>sw average b magn (vec)</Name>
       <ParameterKey>omni_hro2_5min_b_amag</ParameterKey>
-      <Description/>
       <UCD>phys.magField</UCD>
       <Units>nT</Units>
       <RenderingHints>
@@ -329,4 +327,4 @@ for creating the OMNI data set.</Acknowledgement>
       </Support>
     </Parameter>    
   </NumericalData>
-</Spase>
\ No newline at end of file
+</Spase>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/EAS/solo-eas-pad.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/EAS/solo-eas-pad.xml
index 9c0a661..a4be2a4 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/EAS/solo-eas-pad.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/EAS/solo-eas-pad.xml
@@ -8,7 +8,6 @@
       <AlternateName>Pitch angle distribution</AlternateName>
       <ReleaseDate>2023-01-18T12:00:04Z</ReleaseDate>
       <Description>Level 2 - SWA-EAS 2D Burst Mode psd data</Description>
-      <Acknowledgement/>
       <Contact>
         <PersonID>spase://CNES/Person/CDPP-AMDA/C.J.Owen</PersonID>
         <Role>PrincipalInvestigator</Role>
@@ -47,7 +46,6 @@
          <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
       </AccessInformation>
     <ProviderName>SOAR</ProviderName>
-    <ProviderResourceName/>
     <InstrumentID>spase://CNES/Instrument/CDPP-AMDA/Solar_Orbiter/EAS</InstrumentID>
     <MeasurementType>ThermalPlasma</MeasurementType>
     <TemporalDescription>
@@ -62,7 +60,6 @@
       <Name>PSD: PAD</Name>
       <ParameterKey>eas_pad_psd</ParameterKey>
       <Description>Electron pitch angle data - Phase Space Density</Description>
-      <UCD/>
       <Units>eV m^-2 s^-1 sr^-1 eV^-1</Units>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/EAS/solo-eas1-nm3d.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/EAS/solo-eas1-nm3d.xml
index 896d319..8a4d775 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/EAS/solo-eas1-nm3d.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/EAS/solo-eas1-nm3d.xml
@@ -8,7 +8,6 @@
       <AlternateName>Nominal Mode 3D</AlternateName>
       <ReleaseDate>2023-01-18T12:00:04Z</ReleaseDate>
       <Description>Level 2 - SWA-EAS1 Nominal Mode 3D psd data</Description>
-      <Acknowledgement/>
       <Contact>
         <PersonID>spase://CNES/Person/CDPP-AMDA/C.J.Owen</PersonID>
         <Role>PrincipalInvestigator</Role>
@@ -47,7 +46,6 @@
          <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
       </AccessInformation>
     <ProviderName>SOAR</ProviderName>
-    <ProviderResourceName/>
     <InstrumentID>spase://CNES/Instrument/CDPP-AMDA/Solar_Orbiter/EAS</InstrumentID>
     <MeasurementType>ThermalPlasma</MeasurementType>
     <TemporalDescription>
@@ -62,7 +60,6 @@
       <Name>PSD: sum on elev : 2D</Name>
       <ParameterKey>eas1_nm3d_2d_elevation</ParameterKey>
       <Description>Phase Space Density</Description>
-      <UCD/>
       <Units>eV m^-2 s^-1 sr^-1 eV^-1</Units>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
@@ -76,7 +73,6 @@
       <Name>PSD: sum on azimuth : 2D</Name>
       <ParameterKey>eas1_nm3d_2d_azimuth</ParameterKey>
       <Description>Phase Space Density</Description>
-      <UCD/>
       <Units>eV m^-2 s^-1 sr^-1 eV^-1</Units>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
@@ -89,7 +85,6 @@
       <Name>PSD: sum on energy : 2D</Name>
       <ParameterKey>eas1_nm3d_2d_energy</ParameterKey>
       <Description>Phase Space Density</Description>
-      <UCD/>
       <Units>eV m^-2 s^-1 sr^-1 eV^-1</Units>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/EAS/solo-eas2-nm3d.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/EAS/solo-eas2-nm3d.xml
index a7e4ced..85fe4ee 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/EAS/solo-eas2-nm3d.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/EAS/solo-eas2-nm3d.xml
@@ -8,7 +8,6 @@
       <AlternateName>Nominal Mode 3D</AlternateName>
       <ReleaseDate>2023-01-18T12:00:04Z</ReleaseDate>
       <Description>Level 2 - SWA-EAS2 Nominal Mode 3D psd data</Description>
-      <Acknowledgement/>
       <Contact>
         <PersonID>spase://CNES/Person/CDPP-AMDA/C.J.Owen</PersonID>
         <Role>PrincipalInvestigator</Role>
@@ -47,7 +46,6 @@
          <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
       </AccessInformation>
     <ProviderName>SOAR</ProviderName>
-    <ProviderResourceName/>
     <InstrumentID>spase://CNES/Instrument/CDPP-AMDA/Solar_Orbiter/EAS</InstrumentID>
     <MeasurementType>ThermalPlasma</MeasurementType>
     <TemporalDescription>
@@ -62,7 +60,6 @@
       <Name>PSD: sum on elev : 2D</Name>
       <ParameterKey>eas2_nm3d_2d_elevation</ParameterKey>
       <Description>Phase Space Density</Description>
-      <UCD/>
       <Units>eV m^-2 s^-1 sr^-1 eV^-1</Units>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
@@ -76,7 +73,6 @@
       <Name>PSD: sum on azimuth : 2D</Name>
       <ParameterKey>eas2_nm3d_2d_azimuth</ParameterKey>
       <Description>Phase Space Density</Description>
-      <UCD/>
       <Units>eV m^-2 s^-1 sr^-1 eV^-1</Units>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
@@ -90,7 +86,6 @@
       <Name>PSD: sum on energy : 2D</Name>
       <ParameterKey>eas2_nm3d_2d_energy</ParameterKey>
       <Description>Phase Space Density</Description>
-      <UCD/>
       <Units>eV m^-2 s^-1 sr^-1 eV^-1</Units>
       <RenderingHints>
         <DisplayType>Spectrogram</DisplayType>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/HIS/solo-his-comp10min.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/HIS/solo-his-comp10min.xml
index 891b7f9..8f05374 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/HIS/solo-his-comp10min.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/HIS/solo-his-comp10min.xml
@@ -8,7 +8,6 @@
       <AlternateName>Solar Wind Analyzer, Heavy Ion Sensor, Composition 10 Minute Resolution</AlternateName>
       <ReleaseDate>2023-01-17T12:00:04Z</ReleaseDate>
       <Description>Solar Orbiter, Level 3 Data, Solar Wind Analyser, Heavy Ion Sensor Composition 10 Minute Resolution</Description>
-      <Acknowledgement/>
       <Contact>
         <PersonID>spase://SMWG/Person/Stefano.A.Livi</PersonID>
         <Role>PrincipalInvestigator</Role>
@@ -52,7 +51,6 @@
          <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
       </AccessInformation>
     <ProviderName>SOAR</ProviderName>
-    <ProviderResourceName/>
     <InstrumentID>spase://CNES/Instrument/CDPP-AMDA/Solar_Orbiter/HIS</InstrumentID>
     <MeasurementType>ThermalPlasma</MeasurementType>
     <TemporalDescription>
@@ -66,8 +64,6 @@
     <Parameter>
       <Name>He2 density</Name>
       <ParameterKey>solo_his_comp10min_He2_n</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>cm**-3</Units>
       <FillValue>-1e+31</FillValue>
       <Particle>
@@ -77,8 +73,6 @@
     <Parameter>
       <Name>He2 density err</Name>
       <ParameterKey>solo_his_comp10min_He2_nerr</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>cm**-3</Units>
       <FillValue>-1e+31</FillValue>
       <Support>
@@ -88,9 +82,6 @@
     <Parameter>
       <Name>He2 density quality</Name>
       <ParameterKey>solo_his_comp10min_He2_nqf</ParameterKey>
-      <Description/>
-      <UCD/>
-      <Units></Units>
       <FillValue>-32768</FillValue>
       <Support>
         <SupportQuantity>DataQuality</SupportQuantity>
@@ -99,8 +90,6 @@
     <Parameter>
       <Name>He2 v_thermal</Name>
       <ParameterKey>solo_his_comp10min_He2_ths</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>km/s</Units>
       <FillValue>-1e+31</FillValue>
       <Particle>
@@ -110,8 +99,6 @@
     <Parameter>
       <Name>He2 v_thermal err</Name>
       <ParameterKey>solo_his_comp10min_He2_thserr</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>km/s</Units>
       <FillValue>-1e+31</FillValue>
       <Support>
@@ -121,9 +108,6 @@
     <Parameter>
       <Name>He2 v_thermal quality</Name>
       <ParameterKey>solo_his_comp10min_He2_thsqf</ParameterKey>
-      <Description/>
-      <UCD/>
-      <Units></Units>
       <FillValue>-32768</FillValue>
       <Support>
         <SupportQuantity>DataQuality</SupportQuantity>
@@ -132,8 +116,6 @@
     <Parameter>
       <Name>He2 |v|</Name>
       <ParameterKey>solo_his_comp10min_He2_v</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>km/s</Units>
       <FillValue>-1e+31</FillValue>
       <Particle>
@@ -143,8 +125,6 @@
     <Parameter>
       <Name>He2 |v| err</Name>
       <ParameterKey>solo_his_comp10min_He2_verr</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>km/s</Units>
       <FillValue>-1e+31</FillValue>
       <Support>
@@ -154,9 +134,6 @@
     <Parameter>
       <Name>He2 |v| quality</Name>
       <ParameterKey>solo_his_comp10min_He2_vqf</ParameterKey>
-      <Description/>
-      <UCD/>
-      <Units></Units>
       <FillValue>-32768</FillValue>
       <Support>
         <SupportQuantity>DataQuality</SupportQuantity>
@@ -165,8 +142,6 @@
     <Parameter>
       <Name>C5 density</Name>
       <ParameterKey>solo_his_comp10min_C5_n</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>cm**-3</Units>
       <FillValue>-1e+31</FillValue>
       <Particle>
@@ -176,8 +151,6 @@
     <Parameter>
       <Name>C5 density err</Name>
       <ParameterKey>solo_his_comp10min_C5_nerr</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>cm**-3</Units>
       <FillValue>-1e+31</FillValue>
       <Support>
@@ -187,9 +160,6 @@
     <Parameter>
       <Name>C5 density quality</Name>
       <ParameterKey>solo_his_comp10min_C5_nqf</ParameterKey>
-      <Description/>
-      <UCD/>
-      <Units></Units>
       <FillValue>-32768</FillValue>
       <Support>
         <SupportQuantity>DataQuality</SupportQuantity>
@@ -198,8 +168,6 @@
     <Parameter>
       <Name>C5 v_thermal</Name>
       <ParameterKey>solo_his_comp10min_C5_ths</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>km/s</Units>
       <FillValue>-1e+31</FillValue>
       <Particle>
@@ -209,8 +177,6 @@
     <Parameter>
       <Name>C5 v_thermal err</Name>
       <ParameterKey>solo_his_comp10min_C5_thserr</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>km/s</Units>
       <FillValue>-1e+31</FillValue>
       <Support>
@@ -220,9 +186,6 @@
     <Parameter>
       <Name>C5 v_thermal quality</Name>
       <ParameterKey>solo_his_comp10min_C5_thsqf</ParameterKey>
-      <Description/>
-      <UCD/>
-      <Units></Units>
       <FillValue>-32768</FillValue>
       <Support>
         <SupportQuantity>DataQuality</SupportQuantity>
@@ -231,8 +194,6 @@
     <Parameter>
       <Name>C5 |v|</Name>
       <ParameterKey>solo_his_comp10min_C5_v</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>km/s</Units>
       <FillValue>-1e+31</FillValue>
       <Particle>
@@ -242,8 +203,6 @@
     <Parameter>
       <Name>C5 |v| err</Name>
       <ParameterKey>solo_his_comp10min_C5_verr</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>km/s</Units>
       <FillValue>-1e+31</FillValue>
       <Support>
@@ -253,9 +212,6 @@
     <Parameter>
       <Name>C5 |v| quality</Name>
       <ParameterKey>solo_his_comp10min_C5_vqf</ParameterKey>
-      <Description/>
-      <UCD/>
-      <Units></Units>
       <FillValue>-32768</FillValue>
       <Support>
         <SupportQuantity>DataQuality</SupportQuantity>
@@ -264,8 +220,6 @@
     <Parameter>
       <Name>O6 density</Name>
       <ParameterKey>solo_his_comp10min_O6_n</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>cm**-3</Units>
       <FillValue>-1e+31</FillValue>
       <Particle>
@@ -275,8 +229,6 @@
     <Parameter>
       <Name>O6 density err</Name>
       <ParameterKey>solo_his_comp10min_O6_nerr</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>cm**-3</Units>
       <FillValue>-1e+31</FillValue>
       <Support>
@@ -286,9 +238,6 @@
     <Parameter>
       <Name>O6 density quality</Name>
       <ParameterKey>solo_his_comp10min_O6_nqf</ParameterKey>
-      <Description/>
-      <UCD/>
-      <Units></Units>
       <FillValue>-32768</FillValue>
       <Support>
         <SupportQuantity>DataQuality</SupportQuantity>
@@ -297,8 +246,6 @@
     <Parameter>
       <Name>O6 v_thermal</Name>
       <ParameterKey>solo_his_comp10min_O6_ths</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>km/s</Units>
       <FillValue>-1e+31</FillValue>
       <Particle>
@@ -308,8 +255,6 @@
     <Parameter>
       <Name>O6 v_thermal err</Name>
       <ParameterKey>solo_his_comp10min_O6_thserr</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>km/s</Units>
       <FillValue>-1e+31</FillValue>
       <Support>
@@ -319,9 +264,6 @@
     <Parameter>
       <Name>O6 v_thermal quality</Name>
       <ParameterKey>solo_his_comp10min_O6_thsqf</ParameterKey>
-      <Description/>
-      <UCD/>
-      <Units></Units>
       <FillValue>-32768</FillValue>
       <Support>
         <SupportQuantity>DataQuality</SupportQuantity>
@@ -330,8 +272,6 @@
     <Parameter>
       <Name>O6 |v|</Name>
       <ParameterKey>solo_his_comp10min_O6_v</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>km/s</Units>
       <FillValue>-1e+31</FillValue>
       <Particle>
@@ -341,8 +281,6 @@
     <Parameter>
       <Name>O6 |v| err</Name>
       <ParameterKey>solo_his_comp10min_O6_verr</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>km/s</Units>
       <FillValue>-1e+31</FillValue>
       <Support>
@@ -352,9 +290,6 @@
     <Parameter>
       <Name>O6 |v| quality</Name>
       <ParameterKey>solo_his_comp10min_O6_vqf</ParameterKey>
-      <Description/>
-      <UCD/>
-      <Units></Units>
       <FillValue>-32768</FillValue>
       <Support>
         <SupportQuantity>DataQuality</SupportQuantity>
@@ -363,8 +298,6 @@
     <Parameter>
       <Name>Fe10 density</Name>
       <ParameterKey>solo_his_comp10min_Fe10_n</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>cm**-3</Units>
       <FillValue>-1e+31</FillValue>
       <Particle>
@@ -374,8 +307,6 @@
     <Parameter>
       <Name>Fe10 density err</Name>
       <ParameterKey>solo_his_comp10min_Fe10_nerr</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>cm**-3</Units>
       <FillValue>-1e+31</FillValue>
       <Support>
@@ -385,9 +316,6 @@
     <Parameter>
       <Name>Fe10 density quality</Name>
       <ParameterKey>solo_his_comp10min_Fe10_nqf</ParameterKey>
-      <Description/>
-      <UCD/>
-      <Units></Units>
       <FillValue>-32768</FillValue>
       <Support>
         <SupportQuantity>DataQuality</SupportQuantity>
@@ -396,8 +324,6 @@
     <Parameter>
       <Name>Fe10 v_thermal</Name>
       <ParameterKey>solo_his_comp10min_Fe10_ths</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>km/s</Units>
       <FillValue>-1e+31</FillValue>
       <Particle>
@@ -407,8 +333,6 @@
     <Parameter>
       <Name>Fe10 v_thermal err</Name>
       <ParameterKey>solo_his_comp10min_Fe10_thserr</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>km/s</Units>
       <FillValue>-1e+31</FillValue>
       <Support>
@@ -418,9 +342,6 @@
     <Parameter>
       <Name>Fe10 v_thermal quality</Name>
       <ParameterKey>solo_his_comp10min_Fe10_thsqf</ParameterKey>
-      <Description/>
-      <UCD/>
-      <Units></Units>
       <FillValue>-32768</FillValue>
       <Support>
         <SupportQuantity>DataQuality</SupportQuantity>
@@ -429,8 +350,6 @@
     <Parameter>
       <Name>Fe10 |v|</Name>
       <ParameterKey>solo_his_comp10min_Fe10_v</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>km/s</Units>
       <FillValue>-1e+31</FillValue>
       <Particle>
@@ -440,8 +359,6 @@
     <Parameter>
       <Name>Fe10 |v| err</Name>
       <ParameterKey>solo_his_comp10min_Fe10_verr</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>km/s</Units>
       <FillValue>-1e+31</FillValue>
       <Support>
@@ -451,9 +368,6 @@
     <Parameter>
       <Name>Fe10 |v| quality</Name>
       <ParameterKey>solo_his_comp10min_Fe10_vqf</ParameterKey>
-      <Description/>
-      <UCD/>
-      <Units></Units>
       <FillValue>-32768</FillValue>
       <Support>
         <SupportQuantity>DataQuality</SupportQuantity>
@@ -462,8 +376,6 @@
     <Parameter>
       <Name>O7/O6 ratio</Name>
       <ParameterKey>solo_his_comp10min_O7_O6_r</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>km/s</Units>
       <FillValue>-1e+31</FillValue>
       <Particle>
@@ -473,8 +385,6 @@
     <Parameter>
       <Name>O7/O6 ratio err</Name>
       <ParameterKey>solo_his_comp10min_O7_O6_rerr</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>km/s</Units>
       <FillValue>-1e+31</FillValue>
       <Support>
@@ -484,9 +394,6 @@
     <Parameter>
       <Name>O7/O6 ratio quality</Name>
       <ParameterKey>solo_his_comp10min_O7_O6_rqf</ParameterKey>
-      <Description/>
-      <UCD/>
-      <Units></Units>
       <FillValue>-32768</FillValue>
       <Support>
         <SupportQuantity>DataQuality</SupportQuantity>
@@ -495,8 +402,6 @@
     <Parameter>
       <Name>C6/C4 ratio</Name>
       <ParameterKey>solo_his_comp10min_C6_C4_r</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>km/s</Units>
       <FillValue>-1e+31</FillValue>
       <Particle>
@@ -506,8 +411,6 @@
     <Parameter>
       <Name>C6/C4 ratio err</Name>
       <ParameterKey>solo_his_comp10min_C6_C4_rerr</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>km/s</Units>
       <FillValue>-1e+31</FillValue>
       <Support>
@@ -517,9 +420,6 @@
     <Parameter>
       <Name>C6/C4 ratio quality</Name>
       <ParameterKey>solo_his_comp10min_C6_C4_rqf</ParameterKey>
-      <Description/>
-      <UCD/>
-      <Units></Units>
       <FillValue>-32768</FillValue>
       <Support>
         <SupportQuantity>DataQuality</SupportQuantity>
@@ -528,8 +428,6 @@
     <Parameter>
       <Name>C6/C5 ratio</Name>
       <ParameterKey>solo_his_comp10min_C6_C5_r</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>km/s</Units>
       <FillValue>-1e+31</FillValue>
       <Particle>
@@ -539,8 +437,6 @@
     <Parameter>
       <Name>C6/C5 ratio err</Name>
       <ParameterKey>solo_his_comp10min_C6_C5_rerr</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>km/s</Units>
       <FillValue>-1e+31</FillValue>
       <Support>
@@ -550,9 +446,6 @@
     <Parameter>
       <Name>C6/C5 ratio quality</Name>
       <ParameterKey>solo_his_comp10min_C6_C5_rqf</ParameterKey>
-      <Description/>
-      <UCD/>
-      <Units></Units>
       <FillValue>-32768</FillValue>
       <Support>
         <SupportQuantity>DataQuality</SupportQuantity>
@@ -561,8 +454,6 @@
     <Parameter>
       <Name>Fe/O abun</Name>
       <ParameterKey>solo_his_comp10min_Fe_O_a</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>km/s</Units>
       <FillValue>-1e+31</FillValue>
       <Particle>
@@ -572,8 +463,6 @@
     <Parameter>
       <Name>Fe/O abun err</Name>
       <ParameterKey>solo_his_comp10min_Fe_O_aerr</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>km/s</Units>
       <FillValue>-1e+31</FillValue>
       <Support>
@@ -583,9 +472,6 @@
     <Parameter>
       <Name>Fe/O abun quality</Name>
       <ParameterKey>solo_his_comp10min_Fe_O_aqf</ParameterKey>
-      <Description/>
-      <UCD/>
-      <Units></Units>
       <FillValue>-32768</FillValue>
       <Support>
         <SupportQuantity>DataQuality</SupportQuantity>
@@ -594,8 +480,6 @@
     <Parameter>
       <Name>C/O abun</Name>
       <ParameterKey>solo_his_comp10min_C_O_a</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>km/s</Units>
       <FillValue>-1e+31</FillValue>
       <Particle>
@@ -605,8 +489,6 @@
     <Parameter>
       <Name>C/O abun err</Name>
       <ParameterKey>solo_his_comp10min_C_O_aerr</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>km/s</Units>
       <FillValue>-1e+31</FillValue>
       <Support>
@@ -616,9 +498,6 @@
     <Parameter>
       <Name>C/O abun quality</Name>
       <ParameterKey>solo_his_comp10min_C_O_aqf</ParameterKey>
-      <Description/>
-      <UCD/>
-      <Units></Units>
       <FillValue>-32768</FillValue>
       <Support>
         <SupportQuantity>DataQuality</SupportQuantity>
@@ -627,8 +506,6 @@
     <Parameter>
       <Name>He/O abun</Name>
       <ParameterKey>solo_his_comp10min_He_O_a</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>km/s</Units>
       <FillValue>-1e+31</FillValue>
       <Particle>
@@ -638,8 +515,6 @@
     <Parameter>
       <Name>He/O abun err</Name>
       <ParameterKey>solo_his_comp10min_He_O_aerr</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>km/s</Units>
       <FillValue>-1e+31</FillValue>
       <Support>
@@ -649,9 +524,6 @@
     <Parameter>
       <Name>He/O abun quality</Name>
       <ParameterKey>solo_his_comp10min_He_O_aqf</ParameterKey>
-      <Description/>
-      <UCD/>
-      <Units></Units>
       <FillValue>-32768</FillValue>
       <Support>
         <SupportQuantity>DataQuality</SupportQuantity>
@@ -660,8 +532,6 @@
     <Parameter>
       <Name>Mg/O abun</Name>
       <ParameterKey>solo_his_comp10min_Mg_O_a</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>km/s</Units>
       <FillValue>-1e+31</FillValue>
       <Particle>
@@ -671,8 +541,6 @@
     <Parameter>
       <Name>Mg/O abun err</Name>
       <ParameterKey>solo_his_comp10min_Mg_O_aerr</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>km/s</Units>
       <FillValue>-1e+31</FillValue>
       <Support>
@@ -682,9 +550,6 @@
     <Parameter>
       <Name>Mg/O abun quality</Name>
       <ParameterKey>solo_his_comp10min_Mg_O_aqf</ParameterKey>
-      <Description/>
-      <UCD/>
-      <Units></Units>
       <FillValue>-32768</FillValue>
       <Support>
         <SupportQuantity>DataQuality</SupportQuantity>
@@ -693,8 +558,6 @@
     <Parameter>
       <Name>Si/O abun</Name>
       <ParameterKey>solo_his_comp10min_Si_O_a</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>km/s</Units>
       <FillValue>-1e+31</FillValue>
       <Particle>
@@ -704,8 +567,6 @@
     <Parameter>
       <Name>Si/O abun err</Name>
       <ParameterKey>solo_his_comp10min_Si_O_aerr</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>km/s</Units>
       <FillValue>-1e+31</FillValue>
       <Support>
@@ -715,9 +576,6 @@
     <Parameter>
       <Name>Si/O abun quality</Name>
       <ParameterKey>solo_his_comp10min_Si_O_aqf</ParameterKey>
-      <Description/>
-      <UCD/>
-      <Units></Units>
       <FillValue>-32768</FillValue>
       <Support>
         <SupportQuantity>DataQuality</SupportQuantity>
@@ -726,8 +584,6 @@
     <Parameter>
       <Name>Ne/O abun</Name>
       <ParameterKey>solo_his_comp10min_Ne_O_a</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>km/s</Units>
       <FillValue>-1e+31</FillValue>
       <Particle>
@@ -737,8 +593,6 @@
     <Parameter>
       <Name>Ne/O abun err</Name>
       <ParameterKey>solo_his_comp10min_Ne_O_aerr</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>km/s</Units>
       <FillValue>-1e+31</FillValue>
       <Support>
@@ -748,9 +602,6 @@
     <Parameter>
       <Name>Ne/O abun quality</Name>
       <ParameterKey>solo_his_comp10min_Ne_O_aqf</ParameterKey>
-      <Description/>
-      <UCD/>
-      <Units></Units>
       <FillValue>-32768</FillValue>
       <Support>
         <SupportQuantity>DataQuality</SupportQuantity>
@@ -759,8 +610,6 @@
     <Parameter>
       <Name>S/O abun</Name>
       <ParameterKey>solo_his_comp10min_S_O_a</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>km/s</Units>
       <FillValue>-1e+31</FillValue>
       <Particle>
@@ -770,8 +619,6 @@
     <Parameter>
       <Name>S/O abun err</Name>
       <ParameterKey>solo_his_comp10min_S_O_aerr</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>km/s</Units>
       <FillValue>-1e+31</FillValue>
       <Support>
@@ -781,9 +628,6 @@
     <Parameter>
       <Name>S/O abun quality</Name>
       <ParameterKey>solo_his_comp10min_S_O_aqf</ParameterKey>
-      <Description/>
-      <UCD/>
-      <Units></Units>
       <FillValue>-32768</FillValue>
       <Support>
         <SupportQuantity>DataQuality</SupportQuantity>
@@ -792,8 +636,6 @@
     <Parameter>
       <Name>N/O abun</Name>
       <ParameterKey>solo_his_comp10min_N_O_a</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>km/s</Units>
       <FillValue>-1e+31</FillValue>
       <Particle>
@@ -803,8 +645,6 @@
     <Parameter>
       <Name>N/O abun err</Name>
       <ParameterKey>solo_his_comp10min_N_O_aerr</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>km/s</Units>
       <FillValue>-1e+31</FillValue>
       <Support>
@@ -814,9 +654,6 @@
     <Parameter>
       <Name>N/O abun quality</Name>
       <ParameterKey>solo_his_comp10min_N_O_aqf</ParameterKey>
-      <Description/>
-      <UCD/>
-      <Units></Units>
       <FillValue>-32768</FillValue>
       <Support>
         <SupportQuantity>DataQuality</SupportQuantity>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l3.mommag.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l3.mommag.xml
index 8ad0242..c3f4fe6 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l3.mommag.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l3.mommag.xml
@@ -4,11 +4,9 @@
   <NumericalData>
     <ResourceID>spase://CNES/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l3.mommag</ResourceID>
     <ResourceHeader>
-      <ResourceName>PAS test - moments computed with MAG</ResourceName>
-      <AlternateName/>
+      <ResourceName>prot. and alpha mom. with MAG</ResourceName>
       <ReleaseDate>2023-06-25T04:32:56Z</ReleaseDate>
-      <Description>Moments computed from the Proton part of ion distribution function measured by PAS using MAG data</Description>
-      <Acknowledgement/>
+      <Description>Proton and alpha moments computed with Durovcova and Prech's algorithm from the ion distributions measured by PAS using MAG data</Description>
       <Contact>
         <PersonID>spase://SMWG/Person/Philippe.Louarn</PersonID>
         <Role>PrincipalInvestigator</Role>
@@ -18,9 +16,12 @@
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <InformationURL>
-        <Name/>
-        <URL/>
-        <Description/>
+        <Name>Processing of VDFs observed by the SWA-PAS instrument</Name>
+        <URL>http://solarorbiter.irap.omp.eu/documents/SCIENCE_DATA_PROCESSING/SWA_PAS_L3_processing.pdf</URL>
+      </InformationURL>
+      <InformationURL>
+        <Name>Durovcová, T.; Safránková, J.; Nemecek, Z. - Evolution of Relative Drifts in the Expanding Solar Wind: Helios Observations. Sol Phys 294, 97 (2019) - https://doi.org/10.1007/s11207-019-1490-y</Name>
+        <URL>https://doi.org/10.1007/s11207-019-1490-y</URL>
       </InformationURL>
       <Association>
         <AssociationID>solo-pas-l3</AssociationID>
@@ -57,7 +58,6 @@
       <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
     </AccessInformation>
     <ProviderName>IRAP</ProviderName>
-    <ProviderResourceName/>
     <InstrumentID>spase://CNES/Instrument/CDPP-AMDA/Solar_Orbiter/PAS</InstrumentID>
     <MeasurementType>ThermalPlasma</MeasurementType>
     <TemporalDescription>
@@ -71,8 +71,6 @@
     <Parameter>
       <Name>proton density</Name>
       <ParameterKey>pas_mommag_np</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>cm**-3</Units>
       <Particle>
         <ParticleQuantity>NumberDensity</ParticleQuantity>
@@ -81,8 +79,6 @@
     <Parameter>
       <Name>alpha density</Name>
       <ParameterKey>pas_mommag_na</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>cm**-3</Units>
       <Particle>
         <ParticleQuantity>NumberDensity</ParticleQuantity>
@@ -92,7 +88,6 @@
       <Name>vp_rtn</Name>
       <ParameterKey>pas_mommag_vp</ParameterKey>
       <Description>Proton Velocity</Description>
-      <UCD/>
       <Units>km/s</Units>
       <CoordinateSystem>
         <CoordinateRepresentation>Cartesian</CoordinateRepresentation>
@@ -139,7 +134,6 @@
       <Name>va_rtn</Name>
       <ParameterKey>pas_mommag_va</ParameterKey>
       <Description>Alpha Velocity</Description>
-      <UCD/>
       <Units>km/s</Units>
       <CoordinateSystem>
         <CoordinateRepresentation>Cartesian</CoordinateRepresentation>
@@ -282,7 +276,6 @@
       <Name>flag #1</Name>
       <ParameterKey>pas_mommag_flag1</ParameterKey>
       <Description>R2 coefficient of determination of the fit of VDF proton part</Description>
-      <Units/>
       <Support>
         <SupportQuantity>DataQuality</SupportQuantity>
       </Support>
@@ -291,7 +284,6 @@
       <Name>flag #2</Name>
       <ParameterKey>pas_mommag_flag2</ParameterKey>
       <Description>R2 coefficient of determination of the fit of VDF alpha part</Description>
-      <Units/>
       <Support>
         <SupportQuantity>DataQuality</SupportQuantity>
       </Support>
@@ -300,7 +292,6 @@
       <Name>flag #3</Name>
       <ParameterKey>pas_mommag_flag3</ParameterKey>
       <Description>Overlap of the proton and alpha part</Description>
-      <Units/>
       <Support>
         <SupportQuantity>DataQuality</SupportQuantity>
       </Support>
@@ -309,7 +300,6 @@
       <Name>flag #4</Name>
       <ParameterKey>pas_mommag_flag4</ParameterKey>
       <Description>Ratio between fitted proton density to ground-calculated proton density</Description>
-      <Units/>
       <Support>
         <SupportQuantity>DataQuality</SupportQuantity>
       </Support>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l3.momnomag.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l3.momnomag.xml
index e39ee74..43f95ed 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l3.momnomag.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l3.momnomag.xml
@@ -4,11 +4,9 @@
   <NumericalData>
     <ResourceID>spase://CNES/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l3.momnomag</ResourceID>
     <ResourceHeader>
-      <ResourceName>PAS test - moments</ResourceName>
-      <AlternateName/>
+      <ResourceName>prot. and alpha mom.</ResourceName>
       <ReleaseDate>2023-06-25T04:32:57Z</ReleaseDate>
-      <Description>Moments computed from the Proton part of ion distribution function measured by PAS</Description>
-      <Acknowledgement/>
+      <Description>Proton and alpha moments computed with Durovcova and Prech's algorithm from the ion distributions measured by PAS</Description>
       <Contact>
         <PersonID>spase://SMWG/Person/Philippe.Louarn</PersonID>
         <Role>PrincipalInvestigator</Role>
@@ -18,9 +16,12 @@
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <InformationURL>
-        <Name/>
-        <URL/>
-        <Description/>
+        <Name>Processing of VDFs observed by the SWA-PAS instrument</Name>
+        <URL>http://solarorbiter.irap.omp.eu/documents/SCIENCE_DATA_PROCESSING/SWA_PAS_L3_processing.pdf</URL>
+      </InformationURL>
+      <InformationURL>
+        <Name>Durovcová, T.; Safránková, J.; Nemecek, Z. - Evolution of Relative Drifts in the Expanding Solar Wind: Helios Observations. Sol Phys 294, 97 (2019) - https://doi.org/10.1007/s11207-019-1490-y</Name>
+        <URL>https://doi.org/10.1007/s11207-019-1490-y</URL>
       </InformationURL>
       <Association>
         <AssociationID>solo-pas-l3</AssociationID>
@@ -57,7 +58,6 @@
       <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
     </AccessInformation>
     <ProviderName>IRAP</ProviderName>
-    <ProviderResourceName/>
     <InstrumentID>spase://CNES/Instrument/CDPP-AMDA/Solar_Orbiter/PAS</InstrumentID>
     <MeasurementType>ThermalPlasma</MeasurementType>
     <TemporalDescription>
@@ -71,8 +71,6 @@
     <Parameter>
       <Name>proton density</Name>
       <ParameterKey>pas_momnomag_np</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>cm**-3</Units>
       <Particle>
         <ParticleQuantity>NumberDensity</ParticleQuantity>
@@ -81,8 +79,6 @@
     <Parameter>
       <Name>alpha density</Name>
       <ParameterKey>pas_momnomag_na</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>cm**-3</Units>
       <Particle>
         <ParticleQuantity>NumberDensity</ParticleQuantity>
@@ -92,7 +88,6 @@
       <Name>vp_rtn</Name>
       <ParameterKey>pas_momnomag_vp</ParameterKey>
       <Description>Proton Velocity</Description>
-      <UCD/>
       <Units>km/s</Units>
       <CoordinateSystem>
         <CoordinateRepresentation>Cartesian</CoordinateRepresentation>
@@ -139,7 +134,6 @@
       <Name>va_rtn</Name>
       <ParameterKey>pas_momnomag_va</ParameterKey>
       <Description>Alpha Velocity</Description>
-      <UCD/>
       <Units>km/s</Units>
       <CoordinateSystem>
         <CoordinateRepresentation>Cartesian</CoordinateRepresentation>
@@ -246,7 +240,6 @@
       <Name>flag #1</Name>
       <ParameterKey>pas_momnomag_flag1</ParameterKey>
       <Description>R2 coefficient of determination of the fit of VDF proton part</Description>
-      <Units/>
       <Support>
         <SupportQuantity>DataQuality</SupportQuantity>
       </Support>
@@ -255,7 +248,6 @@
       <Name>flag #2</Name>
       <ParameterKey>pas_momnomag_flag2</ParameterKey>
       <Description>R2 coefficient of determination of the fit of VDF alpha part</Description>
-      <Units/>
       <Support>
         <SupportQuantity>DataQuality</SupportQuantity>
       </Support>
@@ -264,7 +256,6 @@
       <Name>flag #3</Name>
       <ParameterKey>pas_momnomag_flag3</ParameterKey>
       <Description>Overlap of the proton and alpha part</Description>
-      <Units/>
       <Support>
         <SupportQuantity>DataQuality</SupportQuantity>
       </Support>
@@ -273,7 +264,6 @@
       <Name>flag #4</Name>
       <ParameterKey>pas_momnomag_flag4</ParameterKey>
       <Description>Ratio between fitted proton density to ground-calculated proton density</Description>
-      <Units/>
       <Support>
         <SupportQuantity>DataQuality</SupportQuantity>
       </Support>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/RPW/so-rpw-peaktracking.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/RPW/so-rpw-peaktracking.xml
index 2b70653..fcf0ebc 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/RPW/so-rpw-peaktracking.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/RPW/so-rpw-peaktracking.xml
@@ -63,7 +63,6 @@
     <Parameter>
       <Name>e- density</Name>
       <ParameterKey>solo_rpwpeaktracking_ne</ParameterKey>
-      <Description/>
       <UCD>phys.density;phys.electron</UCD>
       <Units>cm^-3</Units>
       <UnitsConversion>1.0e6&gt;m^-3</UnitsConversion>
@@ -80,7 +79,6 @@
     <Parameter>
       <Name>c factor</Name>
       <ParameterKey>solo_rpwpeaktracking_cfactor</ParameterKey>
-      <Description/>
       <Support>
         <SupportQuantity>Other</SupportQuantity>
       </Support>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/RPW/solo-rpw-survbp1.bf0.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/RPW/solo-rpw-survbp1.bf0.xml
index 4c31870..017b819 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/RPW/solo-rpw-survbp1.bf0.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/RPW/solo-rpw-survbp1.bf0.xml
@@ -90,7 +90,6 @@
             <Name>DOP</Name>
             <ParameterKey>solo_rpwbp1bf0_dop</ParameterKey>
             <Description>Degree of polarization from magnetic field in normal mode</Description>
-            <Units></Units>
             <RenderingHints>
                 <DisplayType>Spectrogram</DisplayType>
             </RenderingHints>
@@ -104,7 +103,6 @@
             <Name>ellip</Name>
             <ParameterKey>solo_rpwbp1bf0_ellip</ParameterKey>
             <Description>Wave ellipticity from magnetic field in normal mode</Description>
-            <Units></Units>
             <RenderingHints>
                 <DisplayType>Spectrogram</DisplayType>
             </RenderingHints>
@@ -118,7 +116,6 @@
             <Name>n1</Name>
             <ParameterKey>solo_rpwbp1bf0_n1</ParameterKey>
             <Description>Component 1 of the Wave normal vector from magnetic field in normal mode in the SCM B1-B2-B3 axis system frame</Description>
-            <Units></Units>
             <RenderingHints>
                 <DisplayType>Spectrogram</DisplayType>
             </RenderingHints>
@@ -132,7 +129,6 @@
             <Name>n2</Name>
             <ParameterKey>solo_rpwbp1bf0_n2</ParameterKey>
             <Description>Component 2 of the Wave normal vector from magnetic field in normal mode in the SCM B1-B2-B3 axis system frame</Description>
-            <Units></Units>
             <RenderingHints>
                 <DisplayType>Spectrogram</DisplayType>
             </RenderingHints>
@@ -146,7 +142,6 @@
             <Name>n3</Name>
             <ParameterKey>solo_rpwbp1bf0_n3</ParameterKey>
             <Description>Component 3 of the Wave normal vector from magnetic field in normal mode in the SCM B1-B2-B3 axis system frame</Description>
-            <Units></Units>
             <RenderingHints>
                 <DisplayType>Spectrogram</DisplayType>
             </RenderingHints>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/RPW/solo-rpw-survbp1.bf1.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/RPW/solo-rpw-survbp1.bf1.xml
index b4191db..28757a9 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/RPW/solo-rpw-survbp1.bf1.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/RPW/solo-rpw-survbp1.bf1.xml
@@ -90,7 +90,6 @@
             <Name>DOP</Name>
             <ParameterKey>solo_rpwbp1bf1_dop</ParameterKey>
             <Description>Degree of polarization from magnetic field in normal mode</Description>
-            <Units></Units>
             <RenderingHints>
                 <DisplayType>Spectrogram</DisplayType>
             </RenderingHints>
@@ -104,7 +103,6 @@
             <Name>ellip</Name>
             <ParameterKey>solo_rpwbp1bf1_ellip</ParameterKey>
             <Description>Wave ellipticity from magnetic field in normal mode</Description>
-            <Units></Units>
             <RenderingHints>
                 <DisplayType>Spectrogram</DisplayType>
             </RenderingHints>
@@ -118,7 +116,6 @@
             <Name>n1</Name>
             <ParameterKey>solo_rpwbp1bf1_n1</ParameterKey>
             <Description>Component 1 of the Wave normal vector from magnetic field in normal mode in the SCM B1-B2-B3 axis system frame</Description>
-            <Units></Units>
             <RenderingHints>
                 <DisplayType>Spectrogram</DisplayType>
             </RenderingHints>
@@ -132,7 +129,6 @@
             <Name>n2</Name>
             <ParameterKey>solo_rpwbp1bf1_n2</ParameterKey>
             <Description>Component 2 of the Wave normal vector from magnetic field in normal mode in the SCM B1-B2-B3 axis system frame</Description>
-            <Units></Units>
             <RenderingHints>
                 <DisplayType>Spectrogram</DisplayType>
             </RenderingHints>
@@ -146,7 +142,6 @@
             <Name>n3</Name>
             <ParameterKey>solo_rpwbp1bf1_n3</ParameterKey>
             <Description>Component 3 of the Wave normal vector from magnetic field in normal mode in the SCM B1-B2-B3 axis system frame</Description>
-            <Units></Units>
             <RenderingHints>
                 <DisplayType>Spectrogram</DisplayType>
             </RenderingHints>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/RPW/solo-rpw-survbp1.nf0.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/RPW/solo-rpw-survbp1.nf0.xml
index a06580c..f785629 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/RPW/solo-rpw-survbp1.nf0.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/RPW/solo-rpw-survbp1.nf0.xml
@@ -90,7 +90,6 @@
             <Name>DOP</Name>
             <ParameterKey>solo_rpwbp1nf0_dop</ParameterKey>
             <Description>Degree of polarization from magnetic field in normal mode</Description>
-            <Units></Units>
             <RenderingHints>
                 <DisplayType>Spectrogram</DisplayType>
             </RenderingHints>
@@ -104,7 +103,6 @@
             <Name>ellip</Name>
             <ParameterKey>solo_rpwbp1nf0_ellip</ParameterKey>
             <Description>Wave ellipticity from magnetic field in normal mode</Description>
-            <Units></Units>
             <RenderingHints>
                 <DisplayType>Spectrogram</DisplayType>
             </RenderingHints>
@@ -118,7 +116,6 @@
             <Name>n1</Name>
             <ParameterKey>solo_rpwbp1nf0_n1</ParameterKey>
             <Description>Component 1 of the Wave normal vector from magnetic field in normal mode in the SCM B1-B2-B3 axis system frame</Description>
-            <Units></Units>
             <RenderingHints>
                 <DisplayType>Spectrogram</DisplayType>
             </RenderingHints>
@@ -132,7 +129,6 @@
             <Name>n2</Name>
             <ParameterKey>solo_rpwbp1nf0_n2</ParameterKey>
             <Description>Component 2 of the Wave normal vector from magnetic field in normal mode in the SCM B1-B2-B3 axis system frame</Description>
-            <Units></Units>
             <RenderingHints>
                 <DisplayType>Spectrogram</DisplayType>
             </RenderingHints>
@@ -146,7 +142,6 @@
             <Name>n3</Name>
             <ParameterKey>solo_rpwbp1nf0_n3</ParameterKey>
             <Description>Component 3 of the Wave normal vector from magnetic field in normal mode in the SCM B1-B2-B3 axis system frame</Description>
-            <Units></Units>
             <RenderingHints>
                 <DisplayType>Spectrogram</DisplayType>
             </RenderingHints>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/RPW/solo-rpw-survbp1.nf1.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/RPW/solo-rpw-survbp1.nf1.xml
index 3557604..196babd 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/RPW/solo-rpw-survbp1.nf1.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/RPW/solo-rpw-survbp1.nf1.xml
@@ -90,7 +90,6 @@
             <Name>DOP</Name>
             <ParameterKey>solo_rpwbp1nf1_dop</ParameterKey>
             <Description>Degree of polarization from magnetic field in normal mode</Description>
-            <Units></Units>
             <RenderingHints>
                 <DisplayType>Spectrogram</DisplayType>
             </RenderingHints>
@@ -104,7 +103,6 @@
             <Name>ellip</Name>
             <ParameterKey>solo_rpwbp1nf1_ellip</ParameterKey>
             <Description>Wave ellipticity from magnetic field in normal mode</Description>
-            <Units></Units>
             <RenderingHints>
                 <DisplayType>Spectrogram</DisplayType>
             </RenderingHints>
@@ -118,7 +116,6 @@
             <Name>n1</Name>
             <ParameterKey>solo_rpwbp1nf1_n1</ParameterKey>
             <Description>Component 1 of the Wave normal vector from magnetic field in normal mode in the SCM B1-B2-B3 axis system frame</Description>
-            <Units></Units>
             <RenderingHints>
                 <DisplayType>Spectrogram</DisplayType>
             </RenderingHints>
@@ -132,7 +129,6 @@
             <Name>n2</Name>
             <ParameterKey>solo_rpwbp1nf1_n2</ParameterKey>
             <Description>Component 2 of the Wave normal vector from magnetic field in normal mode in the SCM B1-B2-B3 axis system frame</Description>
-            <Units></Units>
             <RenderingHints>
                 <DisplayType>Spectrogram</DisplayType>
             </RenderingHints>
@@ -146,7 +142,6 @@
             <Name>n3</Name>
             <ParameterKey>solo_rpwbp1nf1_n3</ParameterKey>
             <Description>Component 3 of the Wave normal vector from magnetic field in normal mode in the SCM B1-B2-B3 axis system frame</Description>
-            <Units></Units>
             <RenderingHints>
                 <DisplayType>Spectrogram</DisplayType>
             </RenderingHints>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/RPW/solo-rpw-survbp1.nf2.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/RPW/solo-rpw-survbp1.nf2.xml
index 47540ef..6a95577 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/RPW/solo-rpw-survbp1.nf2.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/RPW/solo-rpw-survbp1.nf2.xml
@@ -90,7 +90,6 @@
             <Name>DOP</Name>
             <ParameterKey>solo_rpwbp1nf2_dop</ParameterKey>
             <Description>Degree of polarization from magnetic field in normal mode</Description>
-            <Units></Units>
             <RenderingHints>
                 <DisplayType>Spectrogram</DisplayType>
             </RenderingHints>
@@ -104,7 +103,6 @@
             <Name>ellip</Name>
             <ParameterKey>solo_rpwbp1nf2_ellip</ParameterKey>
             <Description>Wave ellipticity from magnetic field in normal mode</Description>
-            <Units></Units>
             <RenderingHints>
                 <DisplayType>Spectrogram</DisplayType>
             </RenderingHints>
@@ -118,7 +116,6 @@
             <Name>n1</Name>
             <ParameterKey>solo_rpwbp1nf2_n1</ParameterKey>
             <Description>Component 1 of the Wave normal vector from magnetic field in normal mode in the SCM B1-B2-B3 axis system frame</Description>
-            <Units></Units>
             <RenderingHints>
                 <DisplayType>Spectrogram</DisplayType>
             </RenderingHints>
@@ -132,7 +129,6 @@
             <Name>n2</Name>
             <ParameterKey>solo_rpwbp1nf2_n2</ParameterKey>
             <Description>Component 2 of the Wave normal vector from magnetic field in normal mode in the SCM B1-B2-B3 axis system frame</Description>
-            <Units></Units>
             <RenderingHints>
                 <DisplayType>Spectrogram</DisplayType>
             </RenderingHints>
@@ -146,7 +142,6 @@
             <Name>n3</Name>
             <ParameterKey>solo_rpwbp1nf2_n3</ParameterKey>
             <Description>Component 3 of the Wave normal vector from magnetic field in normal mode in the SCM B1-B2-B3 axis system frame</Description>
-            <Units></Units>
             <RenderingHints>
                 <DisplayType>Spectrogram</DisplayType>
             </RenderingHints>
diff --git a/NumericalOutput/CDPP-AMDA/JRM33/b_jrm33.xml b/NumericalOutput/CDPP-AMDA/JRM33/b_jrm33.xml
index dbbe169..3ae7da5 100644
--- a/NumericalOutput/CDPP-AMDA/JRM33/b_jrm33.xml
+++ b/NumericalOutput/CDPP-AMDA/JRM33/b_jrm33.xml
@@ -118,7 +118,7 @@
       <Name>|b|</Name>
       <ParameterKey>b_jrm33_con_tot</ParameterKey>
       <Description>Scalar magnitude of the magnetic field in nT</Description>
-      <Ucd>phys.magField</Ucd>
+      <UCD>phys.magField</UCD>
       <Units>nT</Units>
       <UnitsConversion>1e-9&gt;T</UnitsConversion>
       <RenderingHints>
diff --git a/Observatory/CDPP-AMDA/Giotto.xml b/Observatory/CDPP-AMDA/Giotto.xml
index d824a3d..b5d3cf5 100644
--- a/Observatory/CDPP-AMDA/Giotto.xml
+++ b/Observatory/CDPP-AMDA/Giotto.xml
@@ -7,7 +7,7 @@
       <ResourceName>Giotto</ResourceName>
       <AlternateName>ESA's first deep space mission: P1/Halley Flyby</AlternateName>
       <ReleaseDate>2017-03-27T18:45:12Z</ReleaseDate>
-      <Description>>ESA's first deep space mission, Giotto was designed to help solve the mysteries 
+      <Description>&gt;ESA's first deep space mission, Giotto was designed to help solve the mysteries 
 surrounding Comet Halley by passing as close as possible to the comet's nucleus, 
 which it achieved on 14 March 1986 at a distance of just under 600 km. No-one
 expected the spacecraft to survive its battering from comet dust during this encounter,
diff --git a/Person/CDPP-AMDA/C.K.Louis.xml b/Person/CDPP-AMDA/C.K.Louis.xml
index fd40d24..bc788cc 100644
--- a/Person/CDPP-AMDA/C.K.Louis.xml
+++ b/Person/CDPP-AMDA/C.K.Louis.xml
@@ -7,6 +7,5 @@
         <PersonName>Corentin K. Louis</PersonName>
         <OrganizationName>School of Cosmic Physics, DIAS Dunsink Observatory, Dublin Institute for Advanced Studies, Dublin, Ireland</OrganizationName>
         <Email>corentin.louis@dias.ie</Email>
-        <PhoneNumber/>
-    </Person>
+        </Person>
 </Spase>
diff --git a/Person/CDPP-AMDA/Haje.Korth.xml b/Person/CDPP-AMDA/Haje.Korth.xml
index b1a02b4..529daf8 100644
--- a/Person/CDPP-AMDA/Haje.Korth.xml
+++ b/Person/CDPP-AMDA/Haje.Korth.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <Spase xmlns="http://www.spase-group.org/data/schema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.spase-group.org/data/schema http://www.spase-group.org/data/schema/spase-2.4.1.xsd">
   <Version>2.4.1</Version>
   <Person>
diff --git a/Person/CDPP-AMDA/M.K.James.xml b/Person/CDPP-AMDA/M.K.James.xml
index 553db69..dad1664 100644
--- a/Person/CDPP-AMDA/M.K.James.xml
+++ b/Person/CDPP-AMDA/M.K.James.xml
@@ -5,6 +5,5 @@
     <ResourceID>spase://CNES/Person/CDPP-AMDA/M.K.James</ResourceID>
     <PersonName>M. K. James</PersonName>
     <OrganizationName>School of Physics and Astronomy, University of Leicester, Leicester, UK</OrganizationName>
-    <Email/> 
-  </Person>
+    </Person>
 </Spase>
--
libgit2 0.21.2