diff --git a/NumericalData/CDPP-AMDA/ARTEMIS/P1/FGM/athp1-fgm-l.xml b/NumericalData/CDPP-AMDA/ARTEMIS/P1/FGM/athp1-fgm-l.xml
index 4605944..6029960 100644
--- a/NumericalData/CDPP-AMDA/ARTEMIS/P1/FGM/athp1-fgm-l.xml
+++ b/NumericalData/CDPP-AMDA/ARTEMIS/P1/FGM/athp1-fgm-l.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -6,9 +5,9 @@
         <ResourceHeader>
             <ResourceName>0.25 sec (low)</ResourceName>
             <ReleaseDate>2015-10-13T15:43:00</ReleaseDate>
-            <Description/>
+            <Description />
             <Contact>
-                <!-- Uli Auster -->
+                
                 <PersonID>spase://SMWG/Person/Uli.Auster</PersonID>
                 <Role>TechnicalContact</Role>
 	</Contact>            
@@ -139,7 +138,7 @@
         </Parameter>
         
         <Parameter>
-            <Name>⎟b⎢</Name>
+            <Name>|b|</Name>
             <ParameterKey>athp1_bl_tot</ParameterKey>
             <Ucd>phys.magField</Ucd>
             <Units>nT</Units>
@@ -152,4 +151,4 @@
             </Field>
         </Parameter>
     </NumericalData>
-</Spase>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/ARTEMIS/P1/FGM/athp1-fgm-s.xml b/NumericalData/CDPP-AMDA/ARTEMIS/P1/FGM/athp1-fgm-s.xml
index 0522d0f..4450325 100644
--- a/NumericalData/CDPP-AMDA/ARTEMIS/P1/FGM/athp1-fgm-s.xml
+++ b/NumericalData/CDPP-AMDA/ARTEMIS/P1/FGM/athp1-fgm-s.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -6,9 +5,9 @@
         <ResourceHeader>
             <ResourceName>3 sec (spin)</ResourceName>
             <ReleaseDate>2015-10-13T15:44:00</ReleaseDate>
-            <Description/>
+            <Description />
             <Contact>
-                <!-- Uli Auster -->
+                
                 <PersonID>spase://SMWG/Person/Uli.Auster</PersonID>
                 <Role>TechnicalContact</Role>
 	</Contact>            
@@ -147,7 +146,7 @@
         </Parameter>
         
         <Parameter>
-            <Name>⎟b⎢</Name>
+            <Name>|b|</Name>
             <ParameterKey>athp1_bs_tot</ParameterKey>
             <Ucd>phys.magField</Ucd>
             <Units>nT</Units>
@@ -160,4 +159,4 @@
             </Field>
         </Parameter>
     </NumericalData>
-</Spase>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/ARTEMIS/P2/FGM/athp2-fgm-l.xml b/NumericalData/CDPP-AMDA/ARTEMIS/P2/FGM/athp2-fgm-l.xml
index 4512121..4282c12 100644
--- a/NumericalData/CDPP-AMDA/ARTEMIS/P2/FGM/athp2-fgm-l.xml
+++ b/NumericalData/CDPP-AMDA/ARTEMIS/P2/FGM/athp2-fgm-l.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -6,9 +5,9 @@
         <ResourceHeader>
             <ResourceName>0.25 sec (low)</ResourceName>
             <ReleaseDate>2015-10-13T10:43:00</ReleaseDate>
-            <Description/>
+            <Description />
             <Contact>
-                <!-- Uli Auster -->
+                
                 <PersonID>spase://SMWG/Person/Uli.Auster</PersonID>
                 <Role>TechnicalContact</Role>
 	</Contact>
@@ -146,7 +145,7 @@
         </Parameter>
         
         <Parameter>
-            <Name>⎟b⎢</Name>
+            <Name>|b|</Name>
             <ParameterKey>athp2_bl_tot</ParameterKey>
             <Ucd>phys.magField</Ucd>
             <Units>nT</Units>
@@ -159,4 +158,4 @@
             </Field>
         </Parameter>
     </NumericalData>
-</Spase>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/ARTEMIS/P2/FGM/athp2-fgm-s.xml b/NumericalData/CDPP-AMDA/ARTEMIS/P2/FGM/athp2-fgm-s.xml
index 585f6e4..3114d7c 100644
--- a/NumericalData/CDPP-AMDA/ARTEMIS/P2/FGM/athp2-fgm-s.xml
+++ b/NumericalData/CDPP-AMDA/ARTEMIS/P2/FGM/athp2-fgm-s.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -6,9 +5,9 @@
         <ResourceHeader>
             <ResourceName>3 sec (spin)</ResourceName>
             <ReleaseDate>2015-10-13T10:43:00</ReleaseDate>
-            <Description/>
+            <Description />
             <Contact>
-                <!-- Uli Auster -->
+                
                 <PersonID>spase://SMWG/Person/Uli.Auster</PersonID>
                 <Role>TechnicalContact</Role>
 	</Contact>
@@ -146,7 +145,7 @@
         </Parameter>
         
         <Parameter>
-            <Name>⎟b⎢</Name>
+            <Name>|b|</Name>
             <ParameterKey>athp2_bs_tot</ParameterKey>
             <Ucd>phys.magField</Ucd>
             <Units>nT</Units>
@@ -159,4 +158,4 @@
             </Field>
         </Parameter>
     </NumericalData>
-</Spase>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/Cassini/MAG/Saturn_Orbit/cass-mag-orb1.xml b/NumericalData/CDPP-AMDA/Cassini/MAG/Saturn_Orbit/cass-mag-orb1.xml
index 4055ae0..31df0af 100644
--- a/NumericalData/CDPP-AMDA/Cassini/MAG/Saturn_Orbit/cass-mag-orb1.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/MAG/Saturn_Orbit/cass-mag-orb1.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -195,5 +194,5 @@
                 <FieldQuantity>Magnetic</FieldQuantity>
             </Field>
         </Parameter>
-    </NumericalData>
-</Spase>
+    <Parameter><Name>phi</Name><ParameterKey>cass_b_rtn1s_phi</ParameterKey><Description>Magnetic field phi angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter><Parameter><Name>theta</Name><ParameterKey>cass_b_rtn1s_theta</ParameterKey><Description>Magnetic field theta angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter></NumericalData>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/Cassini/MAG/Saturn_Orbit/cass-mag-orb60.xml b/NumericalData/CDPP-AMDA/Cassini/MAG/Saturn_Orbit/cass-mag-orb60.xml
index 06478ac..313a091 100644
--- a/NumericalData/CDPP-AMDA/Cassini/MAG/Saturn_Orbit/cass-mag-orb60.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/MAG/Saturn_Orbit/cass-mag-orb60.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -195,5 +194,5 @@
                 <FieldQuantity>Magnetic</FieldQuantity>
             </Field>
         </Parameter>
-    </NumericalData>
-</Spase>
+    <Parameter><Name>phi</Name><ParameterKey>cass_b_rtn_phi</ParameterKey><Description>Magnetic field phi angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter><Parameter><Name>theta</Name><ParameterKey>cass_b_rtn_theta</ParameterKey><Description>Magnetic field theta angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter></NumericalData>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/Cassini/MAG/cass-mag-jup.xml b/NumericalData/CDPP-AMDA/Cassini/MAG/cass-mag-jup.xml
index cfa14c4..b028477 100644
--- a/NumericalData/CDPP-AMDA/Cassini/MAG/cass-mag-jup.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/MAG/cass-mag-jup.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -158,5 +157,5 @@ Removal of these signals is at the user's discretion.</Caveats>
                 <FieldQuantity>Magnetic</FieldQuantity>
             </Field>
         </Parameter>
-     </NumericalData>
-</Spase>
+     <Parameter><Name>phi</Name><ParameterKey>cass_b_jup_phi</ParameterKey><Description>Magnetic field phi angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter><Parameter><Name>theta</Name><ParameterKey>cass_b_jup_theta</ParameterKey><Description>Magnetic field theta angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter></NumericalData>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/Cassini/MAG/cass-mag-rtn1.xml b/NumericalData/CDPP-AMDA/Cassini/MAG/cass-mag-rtn1.xml
index 01f2d49..963883b 100644
--- a/NumericalData/CDPP-AMDA/Cassini/MAG/cass-mag-rtn1.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/MAG/cass-mag-rtn1.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -93,5 +92,33 @@
                 <FieldQuantity>Magnetic</FieldQuantity>
             </Field>
         </Parameter>
-    </NumericalData>
+	<Parameter>
+		<Name>phi</Name>
+		<ParameterKey>cass_b_rtn1_phi</ParameterKey>
+		<Description>Magnetic field phi angle</Description>
+		<Ucd>phys.magField</Ucd>
+		<Units>degrees</Units>
+		<UnitsConversion>1e-9&amp;gt;T</UnitsConversion>
+		<RenderingHints>
+			<DisplayType>TimeSeries</DisplayType>
+                </RenderingHints>
+		<Structure>
+			<Size>1</Size>
+</Structure>
+	 </Parameter>
+	 <Parameter>
+		 <Name>theta</Name>
+		 <ParameterKey>cass_b_rtn1_theta</ParameterKey>
+		 <Description>Magnetic field theta angle</Description>
+		 <Ucd>phys.magField</Ucd>
+		 <Units>degrees</Units>
+		 <UnitsConversion>1e-9&amp;gt;T</UnitsConversion>
+		 <RenderingHints>
+			 <DisplayType>TimeSeries</DisplayType>
+ </RenderingHints>
+ <Structure>
+	 <Size>1</Size>
+ </Structure>
+</Parameter>
+</NumericalData>
 </Spase>
diff --git a/NumericalData/CDPP-AMDA/Cassini/MAG/cass-mag-rtn60.xml b/NumericalData/CDPP-AMDA/Cassini/MAG/cass-mag-rtn60.xml
index a443d62..2f7eaa1 100644
--- a/NumericalData/CDPP-AMDA/Cassini/MAG/cass-mag-rtn60.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/MAG/cass-mag-rtn60.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -93,5 +92,5 @@
                 <FieldQuantity>Magnetic</FieldQuantity>
             </Field>
         </Parameter>
-    </NumericalData>
-</Spase>
+    <Parameter><Name>phi</Name><ParameterKey>cass_b_rtn60_phi</ParameterKey><Description>Magnetic field phi angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter><Parameter><Name>theta</Name><ParameterKey>cass_b_rtn60_theta</ParameterKey><Description>Magnetic field theta angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter></NumericalData>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/DoubleStar1/FGM/dstar1-fgm-prp.xml b/NumericalData/CDPP-AMDA/DoubleStar1/FGM/dstar1-fgm-prp.xml
index 1ad391c..86a18b8 100644
--- a/NumericalData/CDPP-AMDA/DoubleStar1/FGM/dstar1-fgm-prp.xml
+++ b/NumericalData/CDPP-AMDA/DoubleStar1/FGM/dstar1-fgm-prp.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
    <Version>2.3.1</Version>
    <NumericalData>
@@ -150,5 +149,5 @@
             <FieldQuantity>Magnetic</FieldQuantity>
          </Field>
       </Parameter>
-   </NumericalData>
-</Spase>
+   <Parameter><Name>|b|</Name><ParameterKey>dstar1_fgm_prp_bt</ParameterKey><Description>Magnetic field magnitude</Description><Ucd>phys.magField</Ucd><Units>nT</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter></NumericalData>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-burst.xml b/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-burst.xml
index 1c964b8..18c42df 100644
--- a/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-burst.xml
+++ b/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-burst.xml
@@ -1,4 +1,3 @@
-<?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://cdpp.irap.omp.eu/AMDA-NG/public/schemas/spase-amda-1_1_0.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -72,7 +71,7 @@
         <Keyword>Burst</Keyword>
         <Keyword>GALILEO</Keyword>
         <Parameter>
-            <Name>b irc</Name>
+            <Name>b_irc</Name>
             <ParameterKey>gll_mag_burstirc</ParameterKey>
             <Description>Magnetic field vector components in IRC coordinates </Description>
             <Ucd>phys.magField</Ucd>
@@ -104,7 +103,7 @@
             </Field>
         </Parameter>
         <Parameter>
-            <Name>b sys3</Name>
+            <Name>b_sys3</Name>
             <ParameterKey>gll_mag_burstsys3</ParameterKey>
             <Description>Magnetic field vector components in SYS3 coordinates </Description>
             <Ucd>phys.magField</Ucd>
@@ -150,4 +149,4 @@
             </Field>
         </Parameter>
      </NumericalData>
-</Spase>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-ca.xml b/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-ca.xml
index 72c383d..32fb963 100644
--- a/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-ca.xml
+++ b/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-ca.xml
@@ -1,4 +1,3 @@
-<?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://cdpp.irap.omp.eu/AMDA-NG/public/schemas/spase-amda-1_1_0.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -54,7 +53,7 @@ Coordinate systems
         <Keyword>Callisto</Keyword>
         <Keyword>GALILEO</Keyword>
         <Parameter>
-            <Name>b irc</Name>
+            <Name>b_irc</Name>
             <ParameterKey>gll_mag_cairc</ParameterKey>
             <Description>Magnetic field vector components in IRC coordinates </Description>
             <Ucd>phys.magField</Ucd>
@@ -86,7 +85,7 @@ Coordinate systems
             </Field>
         </Parameter>
         <Parameter>
-            <Name>b cphio</Name>
+            <Name>b_cphio</Name>
             <ParameterKey>gll_mag_cacphio</ParameterKey>
             <Description>Magnetic field vector components in Callisto-centered Phi-Omega coordinates </Description>
             <Ucd>phys.magField</Ucd>
@@ -118,7 +117,7 @@ Coordinate systems
             </Field>
         </Parameter>
         <Parameter>
-            <Name>b csprh</Name>
+            <Name>b_csprh</Name>
             <ParameterKey>gll_mag_cacsprh</ParameterKey>
             <Description>Magnetic field vector components in Callisto-centered spherical coordinates </Description>
             <Ucd>phys.magField</Ucd>
@@ -150,7 +149,7 @@ Coordinate systems
             </Field>
         </Parameter>
         <Parameter>
-            <Name>b sys3</Name>
+            <Name>b_sys3</Name>
             <ParameterKey>gll_mag_casys3</ParameterKey>
             <Description>Magnetic field vector components in SYS3 coordinates </Description>
             <Ucd>phys.magField</Ucd>
@@ -196,4 +195,4 @@ Coordinate systems
             </Field>
         </Parameter>
      </NumericalData>
-</Spase>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-eu.xml b/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-eu.xml
index 912f6b6..4ecbdca 100644
--- a/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-eu.xml
+++ b/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-eu.xml
@@ -1,4 +1,3 @@
-<?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://cdpp.irap.omp.eu/AMDA-NG/public/schemas/spase-amda-1_1_0.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -56,7 +55,7 @@ Coordinate systems
         <Keyword>Europa</Keyword>
         <Keyword>GALILEO</Keyword>
         <Parameter>
-            <Name>b irc</Name>
+            <Name>b_irc</Name>
             <ParameterKey>gll_mag_euirc</ParameterKey>
             <Description>Magnetic field vector components in IRC coordinates </Description>
             <Ucd>phys.magField</Ucd>
@@ -88,7 +87,7 @@ Coordinate systems
             </Field>
         </Parameter>
         <Parameter>
-            <Name>b ephio</Name>
+            <Name>b_ephio</Name>
             <ParameterKey>gll_mag_euephio</ParameterKey>
             <Description>Magnetic field vector components in Europa-centered Phi-Omega coordinates </Description>
             <Ucd>phys.magField</Ucd>
@@ -120,7 +119,7 @@ Coordinate systems
             </Field>
         </Parameter>
         <Parameter>
-            <Name>b esprh</Name>
+            <Name>b_esprh</Name>
             <ParameterKey>gll_mag_euesprh</ParameterKey>
             <Description>Magnetic field vector components in Europa-centered spherical coordinates </Description>
             <Ucd>phys.magField</Ucd>
@@ -198,4 +197,4 @@ Coordinate systems
             </Field>
         </Parameter>
      </NumericalData>
-</Spase>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-ga.xml b/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-ga.xml
index ca85810..b5a022a 100644
--- a/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-ga.xml
+++ b/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-ga.xml
@@ -1,4 +1,3 @@
-<?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://cdpp.irap.omp.eu/AMDA-NG/public/schemas/spase-amda-1_1_0.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -54,7 +53,7 @@
         <Keyword>Ganymede</Keyword>
         <Keyword>GALILEO</Keyword>
         <Parameter>
-            <Name>b irc</Name>
+            <Name>b_irc</Name>
             <ParameterKey>gll_mag_gairc</ParameterKey>
             <Description>Magnetic field vector components in IRC coordinates</Description>
             <Ucd>phys.magField</Ucd>
@@ -86,7 +85,7 @@
             </Field>
         </Parameter>
         <Parameter>
-            <Name>b gphio</Name>
+            <Name>b_gphio</Name>
             <ParameterKey>gll_mag_gagphio</ParameterKey>
             <Description>Magnetic field vector components in Ganymede-centered Phi-Omega coordinates </Description>
             <Ucd>phys.magField</Ucd>
@@ -145,7 +144,7 @@
             </Field>
         </Parameter>
         <Parameter>
-            <Name>b sys3</Name>
+            <Name>b_sys3</Name>
             <ParameterKey>gll_mag_gasys3</ParameterKey>
             <Description>Magnetic field vector components in Ganymede-centered spherical coordinates </Description>
             <Ucd>phys.magField</Ucd>
@@ -191,4 +190,4 @@
             </Field>
         </Parameter>
      </NumericalData>
-</Spase>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-io.xml b/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-io.xml
index bf01de0..4804b32 100644
--- a/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-io.xml
+++ b/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-io.xml
@@ -1,4 +1,3 @@
-<?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://cdpp.irap.omp.eu/AMDA-NG/public/schemas/spase-amda-1_1_0.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -52,7 +51,7 @@ Coordinate systems
         <Keyword>Io</Keyword>
         <Keyword>GALILEO</Keyword>
         <Parameter>
-            <Name>b irc</Name>
+            <Name>b_irc</Name>
             <ParameterKey>gll_mag_ioirc</ParameterKey>
             <Description>Magnetic field vector components in IRC coordinates </Description>
             <Ucd>phys.magField</Ucd>
@@ -84,7 +83,7 @@ Coordinate systems
             </Field>
         </Parameter>
         <Parameter>
-            <Name>b iphio</Name>
+            <Name>b_iphio</Name>
             <ParameterKey>gll_mag_ioiphio</ParameterKey>
             <Description>Magnetic field vector components in Io-centered Phi-Omega coordinates </Description>
             <Ucd>phys.magField</Ucd>
@@ -116,7 +115,7 @@ Coordinate systems
             </Field>
         </Parameter>
         <Parameter>
-            <Name>b isprh</Name>
+            <Name>b_isprh</Name>
             <ParameterKey>gll_mag_ioisprh</ParameterKey>
             <Description>Magnetic field vector components in Io-centered spherical coordinates </Description>
             <Ucd>phys.magField</Ucd>
@@ -145,7 +144,7 @@ Coordinate systems
             </Field>
         </Parameter>
         <Parameter>
-            <Name>b sys3</Name>
+            <Name>b_sys3</Name>
             <ParameterKey>gll_mag_iosys3</ParameterKey>
             <Description>Magnetic field vector components in SYS3 coordinates </Description>
             <Ucd>phys.magField</Ucd>
@@ -188,4 +187,4 @@ Coordinate systems
             </Field>
         </Parameter>
      </NumericalData>
-</Spase>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-msreal.xml b/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-msreal.xml
index 4fa67ab..6ade315 100644
--- a/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-msreal.xml
+++ b/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-msreal.xml
@@ -1,4 +1,3 @@
-<?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://cdpp.irap.omp.eu/AMDA-NG/public/schemas/spase-amda-1_1_0.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -47,7 +46,7 @@
         <Keyword>Magnetosphere</Keyword>
         <Keyword>GALILEO</Keyword>
         <Parameter>
-            <Name>b irc</Name>
+            <Name>b_irc</Name>
             <ParameterKey>gmmr_irc</ParameterKey>
             <Description>Magnetic field vector components in IRC coordinates </Description>
             <Ucd>phys.magField</Ucd>
@@ -111,7 +110,7 @@
             </Field>
         </Parameter>
         <Parameter>
-            <Name>b jsm</Name>
+            <Name>b_jsm</Name>
             <ParameterKey>gmmr_jsm</ParameterKey>
             <Description>Magnetic field vector components in JSM coordinates </Description>
             <Ucd>phys.magField</Ucd>
@@ -143,7 +142,7 @@
             </Field>
         </Parameter>
         <Parameter>
-            <Name>b sys3</Name>
+            <Name>b_sys3</Name>
             <ParameterKey>gmmr_sys3</ParameterKey>
             <Description>Magnetic field vector components in SYS3 coordinates </Description>
             <Ucd>phys.magField</Ucd>
@@ -188,4 +187,4 @@
             </Field>
         </Parameter>
      </NumericalData>
-</Spase>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/Helios1/E3/helios1-e3-all.xml b/NumericalData/CDPP-AMDA/Helios1/E3/helios1-e3-all.xml
index e4f6b64..e3e65a0 100644
--- a/NumericalData/CDPP-AMDA/Helios1/E3/helios1-e3-all.xml
+++ b/NumericalData/CDPP-AMDA/Helios1/E3/helios1-e3-all.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
    <Version>2.3.1</Version>
    <NumericalData>
@@ -37,7 +36,7 @@
             <URL>http://amda.cdpp.eu</URL>
          </AccessURL>
          <Format>Text</Format>
-         <Acknowledgement/>                   
+         <Acknowledgement />                   
       </AccessInformation>
      <ProviderName>Helios Data Archive</ProviderName>
       <ProviderResourceName>Magnetic Field 6-sec Averages</ProviderResourceName>
@@ -51,47 +50,47 @@
        <Cadence>PT6S</Cadence>        
       </TemporalDescription>
       <ObservedRegion>Heliosphere</ObservedRegion>
-      <Caveats></Caveats>
+      <Caveats />
       <Parameter>
          <Name>|b|</Name>
          <ParameterKey>helios1_e3_bmag</ParameterKey>
          <Description>Magnetic field magnitude</Description>
-         <Ucd/>
+         <Ucd />
          <Units>nT</Units>
-         <UnitsConversion/>
+         <UnitsConversion />
       </Parameter>        
       <Parameter>
          <Name>b_se</Name>
          <ParameterKey>helios1_e3_bse</ParameterKey>
          <Description>Magnetic field in solar ecliptic spacecraft centered coordinates</Description>
-         <Ucd/>
+         <Ucd />
          <Units>nT</Units>
-         <UnitsConversion/>
+         <UnitsConversion />
          <Structure>
             <Size>3</Size>
             <Element>
                <Name>bx</Name>
                <Index>1</Index>
                <ParameterKey>helios1_e3_bse(0)</ParameterKey>
-               <ValidMin/>
-               <ValidMax/>
-               <FillValue/>
+               <ValidMin />
+               <ValidMax />
+               <FillValue />
             </Element>
             <Element>
                <Name>by</Name>
                <Index>2</Index>
                <ParameterKey>helios1_e3_bse(1)</ParameterKey>
-               <ValidMin/>
-               <ValidMax/>
-               <FillValue/>
+               <ValidMin />
+               <ValidMax />
+               <FillValue />
             </Element>
             <Element>
                <Name>bz</Name>
                <Index>3</Index>
                <ParameterKey>helios1_e3_bse(2)</ParameterKey>
-               <ValidMin/>
-               <ValidMax/>
-               <FillValue/>
+               <ValidMin />
+               <ValidMax />
+               <FillValue />
             </Element>
          </Structure>
       </Parameter> 
@@ -99,34 +98,34 @@
          <Name>b_rtn</Name>
          <ParameterKey>helios1_e3_brtn</ParameterKey>
          <Description>Magnetic field in RTN coordinates</Description>
-         <Ucd/>
+         <Ucd />
          <Units>nT</Units>
-         <UnitsConversion/>
+         <UnitsConversion />
          <Structure>
             <Size>3</Size>
             <Element>
                <Name>br</Name>
                <Index>1</Index>
                <ParameterKey>helios1_e3_brtn(0)</ParameterKey>
-               <ValidMin/>
-               <ValidMax/>
-               <FillValue/>
+               <ValidMin />
+               <ValidMax />
+               <FillValue />
             </Element>
             <Element>
                <Name>bt</Name>
                <Index>2</Index>
                <ParameterKey>helios1_e3_brtn(1)</ParameterKey>
-               <ValidMin/>
-               <ValidMax/>
-               <FillValue/>
+               <ValidMin />
+               <ValidMax />
+               <FillValue />
             </Element>
             <Element>
                <Name>bn</Name>
                <Index>3</Index>
                <ParameterKey>helios1_e3_brtn(2)</ParameterKey>
-               <ValidMin/>
-               <ValidMax/>
-               <FillValue/>
+               <ValidMin />
+               <ValidMax />
+               <FillValue />
             </Element>
          </Structure>
       </Parameter>   
@@ -134,36 +133,36 @@
          <Name>std_b</Name>
          <ParameterKey>helios1_e3_std</ParameterKey>
          <Description>Magnetic field standard deviation</Description>
-         <Ucd/>
+         <Ucd />
          <Units>nT</Units>
-         <UnitsConversion/>
+         <UnitsConversion />
          <Structure>
             <Size>3</Size>
             <Element>
                <Name>x</Name>
                <Index>1</Index>
                <ParameterKey>helios1_e3_std(0)</ParameterKey>
-               <ValidMin/>
-               <ValidMax/>
-               <FillValue/>
+               <ValidMin />
+               <ValidMax />
+               <FillValue />
             </Element>
             <Element>
                <Name>y</Name>
                <Index>2</Index>
                <ParameterKey>helios1_e3_std(1)</ParameterKey>
-               <ValidMin/>
-               <ValidMax/>
-               <FillValue/>
+               <ValidMin />
+               <ValidMax />
+               <FillValue />
             </Element>
             <Element>
                <Name>z</Name>
                <Index>3</Index>
                <ParameterKey>helios1_e3_std(2)</ParameterKey>
-               <ValidMin/>
-               <ValidMax/>
-               <FillValue/>
+               <ValidMin />
+               <ValidMax />
+               <FillValue />
             </Element>
          </Structure>
       </Parameter>        
-   </NumericalData>
-</Spase>
+   <Parameter><Name>phi</Name><ParameterKey>helios1_e3_brtn_phi</ParameterKey><Description>Magnetic field phi angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter><Parameter><Name>theta</Name><ParameterKey>helios1_e3_brtn_theta</ParameterKey><Description>Magnetic field theta angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter></NumericalData>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/Helios2/E3/helios2-e3-all.xml b/NumericalData/CDPP-AMDA/Helios2/E3/helios2-e3-all.xml
index af63ccb..a244846 100644
--- a/NumericalData/CDPP-AMDA/Helios2/E3/helios2-e3-all.xml
+++ b/NumericalData/CDPP-AMDA/Helios2/E3/helios2-e3-all.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
    <Version>2.3.1</Version>
    <NumericalData>
@@ -37,7 +36,7 @@
             <URL>http://amda.cdpp.eu</URL>
          </AccessURL>
          <Format>Text</Format>
-         <Acknowledgement/>                   
+         <Acknowledgement />                   
       </AccessInformation>
      <ProviderName>Helios Data Archive</ProviderName>
       <ProviderResourceName>Magnetic Field 6-sec Averages</ProviderResourceName>
@@ -51,47 +50,47 @@
        <Cadence>PT6S</Cadence>        
       </TemporalDescription>
       <ObservedRegion>Heliosphere</ObservedRegion>
-      <Caveats></Caveats>
+      <Caveats />
       <Parameter>
          <Name>|b|</Name>
          <ParameterKey>helios2_e3_bmag</ParameterKey>
          <Description>Magnetic field magnitude</Description>
-         <Ucd/>
+         <Ucd />
          <Units>nT</Units>
-         <UnitsConversion/>
+         <UnitsConversion />
       </Parameter>        
       <Parameter>
          <Name>b_se</Name>
          <ParameterKey>helios2_e3_bse</ParameterKey>
          <Description>Magnetic field in solar ecliptic spacecraft centered coordinates</Description>
-         <Ucd/>
+         <Ucd />
          <Units>nT</Units>
-         <UnitsConversion/>
+         <UnitsConversion />
          <Structure>
             <Size>3</Size>
             <Element>
                <Name>bx</Name>
                <Index>1</Index>
                <ParameterKey>helios2_e3_bse(0)</ParameterKey>
-               <ValidMin/>
-               <ValidMax/>
-               <FillValue/>
+               <ValidMin />
+               <ValidMax />
+               <FillValue />
             </Element>
             <Element>
                <Name>by</Name>
                <Index>2</Index>
                <ParameterKey>helios2_e3_bse(1)</ParameterKey>
-               <ValidMin/>
-               <ValidMax/>
-               <FillValue/>
+               <ValidMin />
+               <ValidMax />
+               <FillValue />
             </Element>
             <Element>
                <Name>bz</Name>
                <Index>3</Index>
                <ParameterKey>helios2_e3_bse(2)</ParameterKey>
-               <ValidMin/>
-               <ValidMax/>
-               <FillValue/>
+               <ValidMin />
+               <ValidMax />
+               <FillValue />
             </Element>
          </Structure>
       </Parameter>
@@ -99,34 +98,34 @@
          <Name>b_rtn</Name>
          <ParameterKey>helios2_e3_brtn</ParameterKey>
          <Description>Magnetic field in RTN coordinates</Description>
-         <Ucd/>
+         <Ucd />
          <Units>nT</Units>
-         <UnitsConversion/>
+         <UnitsConversion />
          <Structure>
             <Size>3</Size>
             <Element>
                <Name>br</Name>
                <Index>1</Index>
                <ParameterKey>helios2_e3_brtn(0)</ParameterKey>
-               <ValidMin/>
-               <ValidMax/>
-               <FillValue/>
+               <ValidMin />
+               <ValidMax />
+               <FillValue />
             </Element>
             <Element>
                <Name>bt</Name>
                <Index>2</Index>
                <ParameterKey>helios2_e3_brtn(1)</ParameterKey>
-               <ValidMin/>
-               <ValidMax/>
-               <FillValue/>
+               <ValidMin />
+               <ValidMax />
+               <FillValue />
             </Element>
             <Element>
                <Name>bn</Name>
                <Index>3</Index>
                <ParameterKey>helios2_e3_brtn(2)</ParameterKey>
-               <ValidMin/>
-               <ValidMax/>
-               <FillValue/>
+               <ValidMin />
+               <ValidMax />
+               <FillValue />
             </Element>
          </Structure>
       </Parameter>   
@@ -134,36 +133,36 @@
          <Name>std_b</Name>
          <ParameterKey>helios2_e3_std</ParameterKey>
          <Description>Magnetic field standard deviation</Description>
-         <Ucd/>
+         <Ucd />
          <Units>nT</Units>
-         <UnitsConversion/>
+         <UnitsConversion />
          <Structure>
             <Size>3</Size>
             <Element>
                <Name>x</Name>
                <Index>1</Index>
                <ParameterKey>helios2_e3_std(0)</ParameterKey>
-               <ValidMin/>
-               <ValidMax/>
-               <FillValue/>
+               <ValidMin />
+               <ValidMax />
+               <FillValue />
             </Element>
             <Element>
                <Name>y</Name>
                <Index>2</Index>
                <ParameterKey>helios2_e3_std(1)</ParameterKey>
-               <ValidMin/>
-               <ValidMax/>
-               <FillValue/>
+               <ValidMin />
+               <ValidMax />
+               <FillValue />
             </Element>
             <Element>
                <Name>z</Name>
                <Index>3</Index>
                <ParameterKey>helios2_e3_std(2)</ParameterKey>
-               <ValidMin/>
-               <ValidMax/>
-               <FillValue/>
+               <ValidMin />
+               <ValidMax />
+               <FillValue />
             </Element>
          </Structure>
       </Parameter>        
-   </NumericalData>
-</Spase>
+   <Parameter><Name>phi</Name><ParameterKey>helios2_e3_brtn_phi</ParameterKey><Description>Magnetic field phi angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter><Parameter><Name>theta</Name><ParameterKey>helios2_e3_brtn_theta</ParameterKey><Description>Magnetic field theta angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter></NumericalData>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/ISEE/ISEE1/MAG/isee1-mag-all.xml b/NumericalData/CDPP-AMDA/ISEE/ISEE1/MAG/isee1-mag-all.xml
index 4a63bed..af1ac52 100644
--- a/NumericalData/CDPP-AMDA/ISEE/ISEE1/MAG/isee1-mag-all.xml
+++ b/NumericalData/CDPP-AMDA/ISEE/ISEE1/MAG/isee1-mag-all.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -129,5 +128,5 @@ CDAWeb team at NASA/GSFC</Acknowledgement>
                 <FieldQuantity>Magnetic</FieldQuantity>
             </Field>
         </Parameter>
-    </NumericalData>
+    <Parameter><Name>|b|</Name><ParameterKey>isee1_mag_all_bt</ParameterKey><Description>Magnetic field magnitude</Description><Ucd>phys.magField</Ucd><Units>nT</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter></NumericalData>
 </Spase>
diff --git a/NumericalData/CDPP-AMDA/ISEE/ISEE2/MAG/isee2-mag-all.xml b/NumericalData/CDPP-AMDA/ISEE/ISEE2/MAG/isee2-mag-all.xml
index 794b8a6..ae9fc53 100644
--- a/NumericalData/CDPP-AMDA/ISEE/ISEE2/MAG/isee2-mag-all.xml
+++ b/NumericalData/CDPP-AMDA/ISEE/ISEE2/MAG/isee2-mag-all.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -122,5 +121,5 @@
                 <FieldQuantity>Magnetic</FieldQuantity>
             </Field>
         </Parameter>
-    </NumericalData>
-</Spase>
+    <Parameter><Name>|b|</Name><ParameterKey>isee2_mag_all_bt</ParameterKey><Description>Magnetic field magnitude</Description><Ucd>phys.magField</Ucd><Units>nT</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter></NumericalData>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-cruise60.xml b/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-cruise60.xml
index 295b0b8..2e5b5f7 100644
--- a/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-cruise60.xml
+++ b/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-cruise60.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -7,7 +6,7 @@
             <ResourceName>1 min</ResourceName>
             <AlternateName>One minite averaged magnetic field</AlternateName>
             <ReleaseDate>2017-10-16T15:10:29Z</ReleaseDate>
-            <Description/>
+            <Description />
               <Contact>
                 <PersonID>spase://CNES/Person/John.E.P.Connerney</PersonID>
                 <Role>PrincipalInvestigator</Role>
@@ -43,7 +42,7 @@
         </TemporalDescription>
         <ObservedRegion>Heliosphere</ObservedRegion>
         <Parameter>
-            <Name>b rtn</Name>
+            <Name>b_rtn</Name>
             <ParameterKey>juno_fgm_cruise60_rtn</ParameterKey>
             <Description>Magnetic field vector components in RTN (se) coordinates</Description>
             <Ucd>phys.magField</Ucd>
@@ -91,4 +90,4 @@
             </Field>
         </Parameter>
     </NumericalData>
-</Spase>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-orb1.xml b/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-orb1.xml
index 1f8b58d..3077224 100644
--- a/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-orb1.xml
+++ b/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-orb1.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -7,7 +6,7 @@
             <ResourceName>1 sec</ResourceName>
             <AlternateName>One second averaged magnetic field</AlternateName>
             <ReleaseDate>2015-10-16T15:10:29Z</ReleaseDate>
-            <Description/>
+            <Description />
             <Contact>
                 <PersonID>spase://CNES/Person/John.E.P.Connerney</PersonID>
                 <Role>PrincipalInvestigator</Role>
@@ -43,7 +42,7 @@
         </TemporalDescription>
         <ObservedRegion>Jupiter</ObservedRegion>
         <Parameter>
-            <Name>b jso</Name>
+            <Name>b_jso</Name>
             <ParameterKey>juno_fgm_orb1_jso</ParameterKey>
             <Description>Magnetic field vector components in JSO (ss) coordinates</Description>
             <Ucd>phys.magField</Ucd>
@@ -76,7 +75,7 @@
             </Field>
         </Parameter>
         <Parameter>
-            <Name>b iau_jupiter</Name>
+            <Name>b_iau_jupiter</Name>
             <ParameterKey>juno_fgm_orb1_iau</ParameterKey>
             <Description>Magnetic field vector components in IAU Jupiter (pc) coordinates</Description>
             <Ucd>phys.magField</Ucd>
@@ -109,7 +108,7 @@
             </Field>
         </Parameter>
 		<Parameter>
-            <Name>b pl</Name>
+            <Name>b_pl</Name>
             <ParameterKey>juno_fgm_orb1_pl</ParameterKey>
             <Description>Magnetic field vector components in pl coordinates</Description>
             <Ucd>phys.magField</Ucd>
@@ -157,4 +156,4 @@
             </Field>
         </Parameter>
     </NumericalData>
-</Spase>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-orb60.xml b/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-orb60.xml
index 11fb203..31dc5df 100644
--- a/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-orb60.xml
+++ b/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-orb60.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -7,7 +6,7 @@
             <ResourceName>1 min</ResourceName>
             <AlternateName>One minute averaged magnetic field</AlternateName>
             <ReleaseDate>2015-10-16T15:10:29Z</ReleaseDate>
-            <Description/>
+            <Description />
              <Contact>
                 <PersonID>spase://CNES/Person/John.E.P.Connerney</PersonID>
                 <Role>PrincipalInvestigator</Role>
@@ -43,7 +42,7 @@
         </TemporalDescription>
         <ObservedRegion>Jupiter</ObservedRegion>
         <Parameter>
-            <Name>b jso</Name>
+            <Name>b_jso</Name>
             <ParameterKey>juno_fgm_orb60_jso</ParameterKey>
             <Description>Magnetic field vector components in JSO (ss) coordinates</Description>
             <Ucd>phys.magField</Ucd>
@@ -76,7 +75,7 @@
             </Field>
         </Parameter>
         <Parameter>
-            <Name>b iau_jupiter</Name>
+            <Name>b_iau_jupiter</Name>
             <ParameterKey>juno_fgm_orb60_iau</ParameterKey>
             <Description>Magnetic field vector components in IAU Jupiter (pc) coordinates</Description>
             <Ucd>phys.magField</Ucd>
@@ -124,4 +123,4 @@
             </Field>
         </Parameter>
     </NumericalData>
-</Spase>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-orbfull.xml b/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-orbfull.xml
index 4f91c82..2128beb 100644
--- a/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-orbfull.xml
+++ b/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-orbfull.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -7,7 +6,7 @@
             <ResourceName>full</ResourceName>
             <AlternateName>High resolution magnetic field</AlternateName>
             <ReleaseDate>2015-10-16T15:10:29Z</ReleaseDate>
-            <Description/>
+            <Description />
              <Contact>
                 <PersonID>spase://CNES/Person/John.E.P.Connerney</PersonID>
                 <Role>PrincipalInvestigator</Role>
@@ -43,7 +42,7 @@
         </TemporalDescription>
         <ObservedRegion>Jupiter</ObservedRegion>
         <Parameter>
-            <Name>b jso</Name>
+            <Name>b_jso</Name>
             <ParameterKey>juno_fgm_orbfull_jso</ParameterKey>
             <Description>Magnetic field vector components in JSO (ss) coordinates</Description>
             <Ucd>phys.magField</Ucd>
@@ -76,7 +75,7 @@
             </Field>
         </Parameter>
         <Parameter>
-            <Name>b iau_jupiter</Name>
+            <Name>b_iau_jupiter</Name>
             <ParameterKey>juno_fgm_orbfull_iau</ParameterKey>
             <Description>Magnetic field vector components in IAU Jupiter (pc) coordinates</Description>
             <Ucd>phys.magField</Ucd>
@@ -109,7 +108,7 @@
             </Field>
         </Parameter>
 		<Parameter>
-            <Name>b pl</Name>
+            <Name>b_pl</Name>
             <ParameterKey>juno_fgm_orbfull_pl</ParameterKey>
             <Description>Magnetic field vector components in pl coordinates</Description>
             <Ucd>phys.magField</Ucd>
@@ -157,4 +156,4 @@
             </Field>
         </Parameter>
     </NumericalData>
-</Spase>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/MAVEN/MAG/mav-mag-kp.xml b/NumericalData/CDPP-AMDA/MAVEN/MAG/mav-mag-kp.xml
index 0ce82b9..48bdd7f 100644
--- a/NumericalData/CDPP-AMDA/MAVEN/MAG/mav-mag-kp.xml
+++ b/NumericalData/CDPP-AMDA/MAVEN/MAG/mav-mag-kp.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
    <Version>2.3.1</Version>
    <NumericalData>
@@ -21,7 +20,7 @@
          <InformationURL>
             <Name>MAG web page, Summary sheet </Name>
             <URL>http://lasp.colorado.edu/home/maven/science/instrument-package/mag/</URL>
-           <Description/>
+           <Description />
          </InformationURL>
       </ResourceHeader>
       <AccessInformation>
@@ -50,41 +49,41 @@
        <CadenceMax>PT8S</CadenceMax>  
       </TemporalDescription>
       <ObservedRegion>Mars</ObservedRegion>
-      <Caveats/>           
+      <Caveats />           
       <Parameter>
          <Name>b_mso</Name>
          <ParameterKey>mav_bkp_mso</ParameterKey>
          <Ucd>phys.magField</Ucd>
          <Units>nT</Units>
-         <UnitsConversion/>
+         <UnitsConversion />
          <Structure>
             <Size>3</Size>
             <Element>
                <Name>bx</Name>
-               <!--Qualifier/-->
+               
                <Index>1</Index>
                <ParameterKey>mav_bkp_mso(0)</ParameterKey>
-               <ValidMin/>
-               <ValidMax/>
-               <FillValue/>
+               <ValidMin />
+               <ValidMax />
+               <FillValue />
             </Element>
             <Element>
                <Name>by</Name>
-               <!--Qualifier/-->
+               
                <Index>2</Index>
                <ParameterKey>mav_bkp_mso(1)</ParameterKey>
-               <ValidMin/>
-               <ValidMax/>
-               <FillValue/>
+               <ValidMin />
+               <ValidMax />
+               <FillValue />
             </Element>
             <Element>
                <Name>bz</Name>
-               <!--Qualifier/-->
+               
                <Index>3</Index>
                <ParameterKey>mav_bkp_mso(2)</ParameterKey>
-               <ValidMin/>
-               <ValidMax/>
-               <FillValue/>
+               <ValidMin />
+               <ValidMax />
+               <FillValue />
             </Element>
          </Structure>
          <Field>
@@ -96,35 +95,35 @@
          <ParameterKey>mav_bkp_iau</ParameterKey>
          <Ucd>phys.magField</Ucd>
          <Units>nT</Units>
-         <UnitsConversion/>
+         <UnitsConversion />
          <Structure>
             <Size>3</Size>
             <Element>
                <Name>bx</Name>
-               <!--Qualifier/-->
+               
                <Index>1</Index>
                <ParameterKey>mav_bkp_iau(0)</ParameterKey>
-               <ValidMin/>
-               <ValidMax/>
-               <FillValue/>
+               <ValidMin />
+               <ValidMax />
+               <FillValue />
             </Element>
             <Element>
                <Name>by</Name>
-               <!--Qualifier/-->
+               
                <Index>2</Index>
                <ParameterKey>mav_bkp_iau(1)</ParameterKey>
-               <ValidMin/>
-               <ValidMax/>
-               <FillValue/>
+               <ValidMin />
+               <ValidMax />
+               <FillValue />
             </Element>
             <Element>
                <Name>bz</Name>
-               <!--Qualifier/-->
+               
                <Index>3</Index>
                <ParameterKey>mav_bkp_iau(2)</ParameterKey>
-               <ValidMin/>
-               <ValidMax/>
-               <FillValue/>
+               <ValidMin />
+               <ValidMax />
+               <FillValue />
             </Element>
          </Structure>
          <Field>
@@ -136,21 +135,21 @@
          <ParameterKey>mav_bkp_tot</ParameterKey>
          <Ucd>phys.magField</Ucd>
          <Units>nT</Units>
-         <UnitsConversion/>
+         <UnitsConversion />
           <Field>
             <FieldQuantity>Magnetic</FieldQuantity>
          </Field>
        </Parameter>   
       <Parameter>
-         <Name>b rms</Name>
+         <Name>b_rms</Name>
          <ParameterKey>mav_bkp_rms</ParameterKey>
          <Description>Deviations from the mean magnitude of the magnetic field</Description>
          <Ucd>phys.magField</Ucd>
          <Units>nT</Units>
-         <UnitsConversion/>
+         <UnitsConversion />
           <Field>
             <FieldQuantity>Magnetic</FieldQuantity>
          </Field>
        </Parameter>   
    </NumericalData>
-</Spase>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/MESSENGER/MAG/Heliosphere/mes-mag-heliosphere01.xml b/NumericalData/CDPP-AMDA/MESSENGER/MAG/Heliosphere/mes-mag-heliosphere01.xml
index 194c9ce..96b1746 100644
--- a/NumericalData/CDPP-AMDA/MESSENGER/MAG/Heliosphere/mes-mag-heliosphere01.xml
+++ b/NumericalData/CDPP-AMDA/MESSENGER/MAG/Heliosphere/mes-mag-heliosphere01.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -88,5 +87,5 @@
                 <FieldQuantity>Magnetic</FieldQuantity>
             </Field>
         </Parameter>
-    </NumericalData>
-</Spase>
+    <Parameter><Name>phi</Name><ParameterKey>mes_b_rtn1s_phi</ParameterKey><Description>Magnetic field phi angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter><Parameter><Name>theta</Name><ParameterKey>mes_b_rtn1s_theta</ParameterKey><Description>Magnetic field theta angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter></NumericalData>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/MESSENGER/MAG/Heliosphere/mes-mag-heliosphere60.xml b/NumericalData/CDPP-AMDA/MESSENGER/MAG/Heliosphere/mes-mag-heliosphere60.xml
index 8deb773..831599f 100644
--- a/NumericalData/CDPP-AMDA/MESSENGER/MAG/Heliosphere/mes-mag-heliosphere60.xml
+++ b/NumericalData/CDPP-AMDA/MESSENGER/MAG/Heliosphere/mes-mag-heliosphere60.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -87,5 +86,5 @@
                 <FieldQuantity>Magnetic</FieldQuantity>
             </Field>
         </Parameter>
-    </NumericalData>
-</Spase>
+    <Parameter><Name>phi</Name><ParameterKey>mes_b_rtn1m_phi</ParameterKey><Description>Magnetic field phi angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter><Parameter><Name>theta</Name><ParameterKey>mes_b_rtn1m_theta</ParameterKey><Description>Magnetic field theta angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter></NumericalData>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/MESSENGER/MAG/Mercury_Orbit/mes-mag-orb01.xml b/NumericalData/CDPP-AMDA/MESSENGER/MAG/Mercury_Orbit/mes-mag-orb01.xml
index 82d80fa..74972a5 100644
--- a/NumericalData/CDPP-AMDA/MESSENGER/MAG/Mercury_Orbit/mes-mag-orb01.xml
+++ b/NumericalData/CDPP-AMDA/MESSENGER/MAG/Mercury_Orbit/mes-mag-orb01.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -7,7 +6,7 @@
             <ResourceName>1 sec</ResourceName>
             <AlternateName>Magnetic Field : Mercury orbit: 1 sec average</AlternateName>
             <ReleaseDate>2019-03-05T21:19:08Z</ReleaseDate>
-            <Description/>
+            <Description />
               <Contact>
                 <PersonID>spase://SMWG/Person/Brian.J.Anderson</PersonID>
                 <Role>PrincipalInvestigator</Role>
@@ -154,5 +153,5 @@
                 <FieldQuantity>Magnetic</FieldQuantity>
             </Field>
         </Parameter>
-    </NumericalData>
-</Spase>
+    <Parameter><Name>phi</Name><ParameterKey>mes_b_orbrtn1s_phi</ParameterKey><Description>Magnetic field phi angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter><Parameter><Name>theta</Name><ParameterKey>mes_b_orbrtn1s_theta</ParameterKey><Description>Magnetic field theta angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter></NumericalData>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/MESSENGER/MAG/Mercury_Orbit/mes-mag-orbit60.xml b/NumericalData/CDPP-AMDA/MESSENGER/MAG/Mercury_Orbit/mes-mag-orbit60.xml
index 64f2f17..79955b8 100644
--- a/NumericalData/CDPP-AMDA/MESSENGER/MAG/Mercury_Orbit/mes-mag-orbit60.xml
+++ b/NumericalData/CDPP-AMDA/MESSENGER/MAG/Mercury_Orbit/mes-mag-orbit60.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -7,7 +6,7 @@
             <ResourceName>60 sec</ResourceName>
             <AlternateName>Magnetic Field : Mercury orbit: 1 min average</AlternateName>
             <ReleaseDate>2019-03-07T15:35:35Z</ReleaseDate>
-            <Description/>
+            <Description />
             <Contact>
                 <PersonID>spase://SMWG/Person/Brian.J.Anderson</PersonID>
                 <Role>PrincipalInvestigator</Role>
@@ -154,5 +153,5 @@
                 <FieldQuantity>Magnetic</FieldQuantity>
             </Field>
         </Parameter>
-    </NumericalData>
-</Spase>
+    <Parameter><Name>phi</Name><ParameterKey>mes_b_orbrtn1m_phi</ParameterKey><Description>Magnetic field phi angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter><Parameter><Name>theta</Name><ParameterKey>mes_b_orbrtn1m_theta</ParameterKey><Description>Magnetic field theta angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter></NumericalData>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/MESSENGER/MAG/Mercury_Orbit/mes-mag-orbitHR.xml b/NumericalData/CDPP-AMDA/MESSENGER/MAG/Mercury_Orbit/mes-mag-orbitHR.xml
index 8e6191e..c925a39 100644
--- a/NumericalData/CDPP-AMDA/MESSENGER/MAG/Mercury_Orbit/mes-mag-orbitHR.xml
+++ b/NumericalData/CDPP-AMDA/MESSENGER/MAG/Mercury_Orbit/mes-mag-orbitHR.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -152,5 +151,5 @@
                 <FieldQuantity>Magnetic</FieldQuantity>
             </Field>
         </Parameter>
-    </NumericalData>
-</Spase>
+    <Parameter><Name>phi</Name><ParameterKey>mes_b_orbrtn_phi</ParameterKey><Description>Magnetic field phi angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter><Parameter><Name>theta</Name><ParameterKey>mes_b_orbrtn_theta</ParameterKey><Description>Magnetic field theta angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter></NumericalData>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/Pioneer10/MAG/p10-mag-full.xml b/NumericalData/CDPP-AMDA/Pioneer10/MAG/p10-mag-full.xml
index 7b973f5..eb4d3b4 100644
--- a/NumericalData/CDPP-AMDA/Pioneer10/MAG/p10-mag-full.xml
+++ b/NumericalData/CDPP-AMDA/Pioneer10/MAG/p10-mag-full.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -95,5 +94,5 @@
                 <FieldQuantity>Magnetic</FieldQuantity>
             </Field>
         </Parameter>
-    </NumericalData>
-</Spase>
+    <Parameter><Name>phi</Name><ParameterKey>p10_b_full_phi</ParameterKey><Description>Magnetic field phi angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter><Parameter><Name>theta</Name><ParameterKey>p10_b_full_theta</ParameterKey><Description>Magnetic field theta angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter></NumericalData>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/Pioneer11/MAG/p11-mag-full.xml b/NumericalData/CDPP-AMDA/Pioneer11/MAG/p11-mag-full.xml
index 0c2c920..4d0e657 100644
--- a/NumericalData/CDPP-AMDA/Pioneer11/MAG/p11-mag-full.xml
+++ b/NumericalData/CDPP-AMDA/Pioneer11/MAG/p11-mag-full.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -95,5 +94,5 @@
                 <FieldQuantity>Magnetic</FieldQuantity>
             </Field>
         </Parameter>
-    </NumericalData>
-</Spase>
+    <Parameter><Name>phi</Name><ParameterKey>p11_b_full_phi</ParameterKey><Description>Magnetic field phi angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter><Parameter><Name>theta</Name><ParameterKey>p11_b_full_theta</ParameterKey><Description>Magnetic field theta angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter></NumericalData>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magib-1s.xml b/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magib-1s.xml
index 15a224c..82c7367 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magib-1s.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magib-1s.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -7,7 +6,7 @@
             <ResourceName>1 s</ResourceName>
             <AlternateName>Inboard calibrated; burst mode</AlternateName>
             <ReleaseDate>2017-07-26T12:59:05Z</ReleaseDate>
-            <Description/>
+            <Description />
             <Contact>
                 <PersonID>spase://SMWG/Person/Karl-Heinz.Glassmeier</PersonID>
                 <Role>PrincipalInvestigator</Role>
@@ -44,7 +43,7 @@
             <Cadence>PT1S</Cadence>
         </TemporalDescription>
         <Parameter>
-            <Name>b cseq</Name>
+            <Name>b_cseq</Name>
             <ParameterKey>ros_ib_1s</ParameterKey>
             <Ucd>phys.magField</Ucd>
             <Units>nT</Units>
@@ -85,4 +84,4 @@
             </Field>
         </Parameter>   
      </NumericalData>
-</Spase>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magib-32s.xml b/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magib-32s.xml
index 0a90f02..82dbaa8 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magib-32s.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magib-32s.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -7,7 +6,7 @@
             <ResourceName>32 s</ResourceName>
             <AlternateName>Inboard calibrated; normal mode</AlternateName>
             <ReleaseDate>2017-07-26T12:58:44Z</ReleaseDate>
-            <Description/>
+            <Description />
             <Contact>
                 <PersonID>spase://SMWG/Person/Karl-Heinz.Glassmeier</PersonID>
                 <Role>PrincipalInvestigator</Role>
@@ -44,7 +43,7 @@
             <Cadence>PT32S</Cadence>
         </TemporalDescription>
         <Parameter>
-            <Name>b cseq</Name>
+            <Name>b_cseq</Name>
             <ParameterKey>ros_ib_32s</ParameterKey>
             <Ucd>phys.magField</Ucd>
             <Units>nT</Units>
@@ -85,4 +84,4 @@
             </Field>
         </Parameter>   
      </NumericalData>
-</Spase>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magib-rsmp.xml b/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magib-rsmp.xml
index 79dce5c..f2a6c8f 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magib-rsmp.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magib-rsmp.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -43,7 +42,7 @@
             <Cadence>PT60S</Cadence>
         </TemporalDescription>
         <Parameter>
-            <Name>b cseq</Name>
+            <Name>b_cseq</Name>
             <ParameterKey>ros_ib_rsmp</ParameterKey>
             <Ucd>phys.magField</Ucd>
             <Units>nT</Units>
@@ -84,4 +83,4 @@
             </Field>
         </Parameter>   
      </NumericalData>
-</Spase>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magib-rsmp1s.xml b/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magib-rsmp1s.xml
index cc1d88d..e1d85e7 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magib-rsmp1s.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magib-rsmp1s.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -44,7 +43,7 @@
         </TemporalDescription>
         <ObservedRegion>Comet</ObservedRegion>
         <Parameter>
-            <Name>b cseq</Name>
+            <Name>b_cseq</Name>
             <ParameterKey>ros_ib_rsmp1</ParameterKey>
             <Ucd>phys.magField</Ucd>
             <Units>nT</Units>
@@ -85,4 +84,4 @@
             </Field>
         </Parameter>   
      </NumericalData>
-</Spase>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magob-1s.xml b/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magob-1s.xml
index 1de5cd2..6197084 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magob-1s.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magob-1s.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -7,7 +6,7 @@
             <ResourceName>1 s</ResourceName>
             <AlternateName>Onboard calibrated; normal mode</AlternateName>
             <ReleaseDate>2017-07-26T11:23:25Z</ReleaseDate>
-            <Description/>
+            <Description />
             <Contact>
                 <PersonID>spase://SMWG/Person/Karl-Heinz.Glassmeier</PersonID>
                 <Role>PrincipalInvestigator</Role>
@@ -44,7 +43,7 @@
             <Cadence>PT1S</Cadence>
         </TemporalDescription>
         <Parameter>
-            <Name>b cseq</Name>
+            <Name>b_cseq</Name>
             <ParameterKey>ros_ob_1s</ParameterKey>
             <Ucd>phys.magField</Ucd>
             <Units>nT</Units>
@@ -85,4 +84,4 @@
             </Field>
         </Parameter>   
      </NumericalData>
-</Spase>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magob-20hz.xml b/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magob-20hz.xml
index f77785c..d7635a0 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magob-20hz.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magob-20hz.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -7,7 +6,7 @@
             <ResourceName>0.05 s</ResourceName>
             <AlternateName>Onboard calibrated; burst mode</AlternateName>
             <ReleaseDate>2017-07-26T11:31:07Z</ReleaseDate>
-            <Description/>
+            <Description />
             <Contact>
                 <PersonID>spase://SMWG/Person/Karl-Heinz.Glassmeier</PersonID>
                 <Role>PrincipalInvestigator</Role>
@@ -44,7 +43,7 @@
             <Cadence>PT1S</Cadence>
         </TemporalDescription>
         <Parameter>
-            <Name>b cseq</Name>
+            <Name>b_cseq</Name>
             <ParameterKey>ros_ob_20hz</ParameterKey>
             <Ucd>phys.magField</Ucd>
             <Units>nT</Units>
@@ -85,4 +84,4 @@
             </Field>
         </Parameter>   
      </NumericalData>
-</Spase>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magob-rsmp.xml b/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magob-rsmp.xml
index 4784d76..11cca2d 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magob-rsmp.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magob-rsmp.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -44,7 +43,7 @@
         </TemporalDescription>
         <ObservedRegion>Comet</ObservedRegion>
         <Parameter>
-            <Name>b cseq</Name>
+            <Name>b_cseq</Name>
             <ParameterKey>ros_ob_rsmp</ParameterKey>
             <Ucd>phys.magField</Ucd>
             <Units>nT</Units>
@@ -85,4 +84,4 @@
             </Field>
         </Parameter>   
      </NumericalData>
-</Spase>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magob-rsmp1s.xml b/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magob-rsmp1s.xml
index 9321c1f..fbd4e0f 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magob-rsmp1s.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magob-rsmp1s.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -44,7 +43,7 @@
         </TemporalDescription>
         <ObservedRegion>Comet</ObservedRegion>
         <Parameter>
-            <Name>b cseq</Name>
+            <Name>b_cseq</Name>
             <ParameterKey>ros_ob_rsmp1</ParameterKey>
             <Ucd>phys.magField</Ucd>
             <Units>nT</Units>
@@ -85,4 +84,4 @@
             </Field>
         </Parameter>   
      </NumericalData>
-</Spase>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/STEREO-A/MAG/sta-b-1min.xml b/NumericalData/CDPP-AMDA/STEREO-A/MAG/sta-b-1min.xml
index 0f64c1d..4f24142 100644
--- a/NumericalData/CDPP-AMDA/STEREO-A/MAG/sta-b-1min.xml
+++ b/NumericalData/CDPP-AMDA/STEREO-A/MAG/sta-b-1min.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -119,5 +118,5 @@
                 <FieldQuantity>Magnetic</FieldQuantity>
             </Field>
         </Parameter>
-    </NumericalData>
-</Spase>
+    <Parameter><Name>phi</Name><ParameterKey>sta_b_rtn_phi</ParameterKey><Description>Magnetic field phi angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter><Parameter><Name>theta</Name><ParameterKey>sta_b_rtn_theta</ParameterKey><Description>Magnetic field theta angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter></NumericalData>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/STEREO-A/MAG/sta-mag-mag.xml b/NumericalData/CDPP-AMDA/STEREO-A/MAG/sta-mag-mag.xml
index f4a9933..cc40b4d 100644
--- a/NumericalData/CDPP-AMDA/STEREO-A/MAG/sta-mag-mag.xml
+++ b/NumericalData/CDPP-AMDA/STEREO-A/MAG/sta-mag-mag.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -83,5 +82,5 @@
                 <FieldQuantity>Magnetic</FieldQuantity>
             </Field>
         </Parameter>
-    </NumericalData>
-</Spase>
+    <Parameter><Name>phi</Name><ParameterKey>sta_b_phi</ParameterKey><Description>Magnetic field phi angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter><Parameter><Name>theta</Name><ParameterKey>sta_b_theta</ParameterKey><Description>Magnetic field theta angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter></NumericalData>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/STEREO-B/MAG/stb-b-1min.xml b/NumericalData/CDPP-AMDA/STEREO-B/MAG/stb-b-1min.xml
index 459ad01..7455f1a 100644
--- a/NumericalData/CDPP-AMDA/STEREO-B/MAG/stb-b-1min.xml
+++ b/NumericalData/CDPP-AMDA/STEREO-B/MAG/stb-b-1min.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -119,5 +118,5 @@
                 <FieldQuantity>Magnetic</FieldQuantity>
             </Field>
         </Parameter>
-    </NumericalData>
-</Spase>
+    <Parameter><Name>phi</Name><ParameterKey>stb_b_rtn_phi</ParameterKey><Description>Magnetic field phi angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter><Parameter><Name>theta</Name><ParameterKey>stb_b_rtn_theta</ParameterKey><Description>Magnetic field theta angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter></NumericalData>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/solo-mag-8s.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/solo-mag-8s.xml
index be7ad30..b84d99f 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/solo-mag-8s.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/solo-mag-8s.xml
@@ -1,4 +1,3 @@
-<?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_3_0.xsd">
    <Version>2.3.0</Version>
    <NumericalData>
@@ -21,7 +20,7 @@
              ESA archive from September 2020.
 
           </Description>
-         <Acknowledgement></Acknowledgement>
+         <Acknowledgement />
          <Contact>
            <PersonID>spase://CDPP/Person/Tim.Horbury</PersonID>
            <Role>PrincipalInvestigator</Role>
@@ -29,7 +28,7 @@
          <InformationURL>
            <Name>Low Latency Data</Name>
             <URL>https://www.cosmos.esa.int/web/solar-orbiter/access-to-solar-orbiter-low-latency-data</URL>
-           <Description></Description>
+           <Description />
          </InformationURL>        
       </ResourceHeader>
       <AccessInformation>
@@ -77,7 +76,7 @@
       <Parameter>
          <Name>b_rtn</Name>
          <ParameterKey>solo_b_rtn_8s</ParameterKey>
-         <Description/>                      
+         <Description />                      
          <Ucd>phys.magField</Ucd>
          <Units>nT</Units>
          <UnitsConversion>1e-9&gt;T</UnitsConversion>
@@ -120,7 +119,7 @@
        <Parameter>
           <Name>b_srf</Name>
           <ParameterKey>solo_b_srf_8s</ParameterKey>
-          <Description/>                      
+          <Description />                      
           <Ucd>phys.magField</Ucd>
           <Units>nT</Units>
           <UnitsConversion>1e-9&gt;T</UnitsConversion>
@@ -210,5 +209,5 @@
           </Structure>
       </Parameter>	
 
-</NumericalData>
-</Spase>
+<Parameter><Name>phi</Name><ParameterKey>solo_b_rtn_8s_phi</ParameterKey><Description>Magnetic field phi angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter><Parameter><Name>theta</Name><ParameterKey>solo_b_rtn_8s_theta</ParameterKey><Description>Magnetic field theta angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter></NumericalData>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/THEMIS/A/FGM/tha-fgm-l.xml b/NumericalData/CDPP-AMDA/THEMIS/A/FGM/tha-fgm-l.xml
index 94a6b75..1c398ed 100644
--- a/NumericalData/CDPP-AMDA/THEMIS/A/FGM/tha-fgm-l.xml
+++ b/NumericalData/CDPP-AMDA/THEMIS/A/FGM/tha-fgm-l.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -6,9 +5,9 @@
         <ResourceHeader>
             <ResourceName>0.25 sec (low)</ResourceName>
             <ReleaseDate>2015-10-13T15:29:00</ReleaseDate>
-            <Description/>
+            <Description />
             <Contact>
-                <!-- Uli Auster -->
+                
                 <PersonID>spase://SMWG/Person/Uli.Auster</PersonID>
                 <Role>TechnicalContact</Role>
             </Contact>           
@@ -107,7 +106,7 @@
             </Field>
         </Parameter>
         <Parameter>
-            <Name>⎟b⎢</Name>
+            <Name>|b|</Name>
             <ParameterKey>tha_bl_tot</ParameterKey>
             <Ucd>phys.magField</Ucd>
             <Units>nT</Units>
@@ -120,4 +119,4 @@
             </Field>
         </Parameter>
     </NumericalData>
-</Spase>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/THEMIS/A/FGM/tha-fgm-s.xml b/NumericalData/CDPP-AMDA/THEMIS/A/FGM/tha-fgm-s.xml
index 133a85a..4fc13b3 100644
--- a/NumericalData/CDPP-AMDA/THEMIS/A/FGM/tha-fgm-s.xml
+++ b/NumericalData/CDPP-AMDA/THEMIS/A/FGM/tha-fgm-s.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -6,9 +5,9 @@
         <ResourceHeader>
             <ResourceName>3 sec (spin)</ResourceName>
             <ReleaseDate>2015-10-13T15:33:00</ReleaseDate>
-            <Description/>
+            <Description />
             <Contact>
-                <!-- Uli Auster -->
+                
                 <PersonID>spase://SMWG/Person/Uli.Auster</PersonID>
                 <Role>TechnicalContact</Role>
             </Contact>           
@@ -107,7 +106,7 @@
             </Field>
         </Parameter>
         <Parameter>
-            <Name>⎟b⎢</Name>
+            <Name>|b|</Name>
             <ParameterKey>tha_bs_tot</ParameterKey>
             <Ucd>phys.magField</Ucd>
             <Units>nT</Units>
@@ -120,4 +119,4 @@
             </Field>
         </Parameter>
     </NumericalData>
-</Spase>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/THEMIS/B/FGM/thb-fgm-l.xml b/NumericalData/CDPP-AMDA/THEMIS/B/FGM/thb-fgm-l.xml
index a29fe3f..8b85af2 100644
--- a/NumericalData/CDPP-AMDA/THEMIS/B/FGM/thb-fgm-l.xml
+++ b/NumericalData/CDPP-AMDA/THEMIS/B/FGM/thb-fgm-l.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -6,9 +5,9 @@
         <ResourceHeader>
             <ResourceName>0.25 sec (low)</ResourceName>
             <ReleaseDate>2015-10-13T15:43:00</ReleaseDate>
-            <Description/>
+            <Description />
             <Contact>
-                <!-- Uli Auster -->
+                
                 <PersonID>spase://SMWG/Person/Uli.Auster</PersonID>
                 <Role>TechnicalContact</Role>
             </Contact>            
@@ -103,7 +102,7 @@
             </Field>
         </Parameter>
         <Parameter>
-            <Name>⎟b⎢</Name>
+            <Name>|b|</Name>
             <ParameterKey>thb_bl_tot</ParameterKey>
             <Ucd>phys.magField</Ucd>
             <Units>nT</Units>
@@ -116,4 +115,4 @@
             </Field>
         </Parameter>
     </NumericalData>
-</Spase>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/THEMIS/B/FGM/thb-fgm-s.xml b/NumericalData/CDPP-AMDA/THEMIS/B/FGM/thb-fgm-s.xml
index b25a208..2efafa3 100644
--- a/NumericalData/CDPP-AMDA/THEMIS/B/FGM/thb-fgm-s.xml
+++ b/NumericalData/CDPP-AMDA/THEMIS/B/FGM/thb-fgm-s.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -6,9 +5,9 @@
         <ResourceHeader>
             <ResourceName>3 sec (spin)</ResourceName>
             <ReleaseDate>2015-10-13T15:44:00</ReleaseDate>
-            <Description/>
+            <Description />
             <Contact>
-                <!-- Uli Auster -->
+                
                 <PersonID>spase://SMWG/Person/Uli.Auster</PersonID>
                 <Role>TechnicalContact</Role>
             </Contact>            
@@ -107,7 +106,7 @@
             </Field>
         </Parameter>
         <Parameter>
-            <Name>⎟b⎢</Name>
+            <Name>|b|</Name>
             <ParameterKey>thb_bs_tot</ParameterKey>
             <Ucd>phys.magField</Ucd>
             <Units>nT</Units>
@@ -120,4 +119,4 @@
             </Field>
         </Parameter>
     </NumericalData>
-</Spase>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/THEMIS/C/FGM/thc-fgm-l.xml b/NumericalData/CDPP-AMDA/THEMIS/C/FGM/thc-fgm-l.xml
index 5930950..b8c393d 100644
--- a/NumericalData/CDPP-AMDA/THEMIS/C/FGM/thc-fgm-l.xml
+++ b/NumericalData/CDPP-AMDA/THEMIS/C/FGM/thc-fgm-l.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -6,9 +5,9 @@
         <ResourceHeader>
             <ResourceName>0.25 sec (low)</ResourceName>
             <ReleaseDate>2015-10-13T10:43:00</ReleaseDate>
-            <Description/>
+            <Description />
             <Contact>
-                <!-- Uli Auster -->
+                
                 <PersonID>spase://SMWG/Person/Uli.Auster</PersonID>
                 <Role>TechnicalContact</Role>
             </Contact>
@@ -106,7 +105,7 @@
             </Field>
         </Parameter>
         <Parameter>
-            <Name>⎟b⎢</Name>
+            <Name>|b|</Name>
             <ParameterKey>thc_bl_tot</ParameterKey>
             <Ucd>phys.magField</Ucd>
             <Units>nT</Units>
@@ -119,4 +118,4 @@
             </Field>
         </Parameter>
     </NumericalData>
-</Spase>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/THEMIS/C/FGM/thc-fgm-s.xml b/NumericalData/CDPP-AMDA/THEMIS/C/FGM/thc-fgm-s.xml
index b82d14b..53106fe 100644
--- a/NumericalData/CDPP-AMDA/THEMIS/C/FGM/thc-fgm-s.xml
+++ b/NumericalData/CDPP-AMDA/THEMIS/C/FGM/thc-fgm-s.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -6,9 +5,9 @@
         <ResourceHeader>
             <ResourceName>3 sec (spin)</ResourceName>
             <ReleaseDate>2015-10-13T10:43:00</ReleaseDate>
-            <Description/>
+            <Description />
             <Contact>
-                <!-- Uli Auster -->
+                
                 <PersonID>spase://SMWG/Person/Uli.Auster</PersonID>
                 <Role>TechnicalContact</Role>
             </Contact>
@@ -106,7 +105,7 @@
             </Field>
         </Parameter>
         <Parameter>
-            <Name>⎟b⎢</Name>
+            <Name>|b|</Name>
             <ParameterKey>thc_bs_tot</ParameterKey>
             <Ucd>phys.magField</Ucd>
             <Units>nT</Units>
@@ -119,4 +118,4 @@
             </Field>
         </Parameter>
     </NumericalData>
-</Spase>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/THEMIS/D/FGM/thd-fgm-l.xml b/NumericalData/CDPP-AMDA/THEMIS/D/FGM/thd-fgm-l.xml
index 4e89450..9714691 100644
--- a/NumericalData/CDPP-AMDA/THEMIS/D/FGM/thd-fgm-l.xml
+++ b/NumericalData/CDPP-AMDA/THEMIS/D/FGM/thd-fgm-l.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -6,9 +5,9 @@
         <ResourceHeader>
             <ResourceName>0.25 sec (low)</ResourceName>
             <ReleaseDate>2015-10-14T15:43:00</ReleaseDate>
-            <Description/>
+            <Description />
             <Contact>
-                <!-- Uli Auster -->
+                
                 <PersonID>spase://SMWG/Person/Uli.Auster</PersonID>
                 <Role>TechnicalContact</Role>
             </Contact>
@@ -107,7 +106,7 @@
             </Field>
         </Parameter>
         <Parameter>
-            <Name>⎟b⎢</Name>
+            <Name>|b|</Name>
             <ParameterKey>thd_bl_tot</ParameterKey>
             <Ucd>phys.magField</Ucd>
             <Units>nT</Units>
@@ -120,4 +119,4 @@
             </Field>
         </Parameter>
     </NumericalData>
-</Spase>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/THEMIS/D/FGM/thd-fgm-s.xml b/NumericalData/CDPP-AMDA/THEMIS/D/FGM/thd-fgm-s.xml
index 83ad62e..ef882fd 100644
--- a/NumericalData/CDPP-AMDA/THEMIS/D/FGM/thd-fgm-s.xml
+++ b/NumericalData/CDPP-AMDA/THEMIS/D/FGM/thd-fgm-s.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -6,9 +5,9 @@
         <ResourceHeader>
             <ResourceName>3 sec (spin)</ResourceName>
             <ReleaseDate>2015-10-14T10:44:00</ReleaseDate>
-            <Description/>
+            <Description />
             <Contact>
-                <!-- Uli Auster -->
+                
                 <PersonID>spase://SMWG/Person/Uli.Auster</PersonID>
                 <Role>TechnicalContact</Role>
             </Contact>
@@ -107,7 +106,7 @@
             </Field>
         </Parameter>
         <Parameter>
-            <Name>⎟b⎢</Name>
+            <Name>|b|</Name>
             <ParameterKey>thd_bs_tot</ParameterKey>
             <Ucd>phys.magField</Ucd>
             <Units>nT</Units>
@@ -120,4 +119,4 @@
             </Field>
         </Parameter>
     </NumericalData>
-</Spase>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/THEMIS/E/FGM/the-fgm-l.xml b/NumericalData/CDPP-AMDA/THEMIS/E/FGM/the-fgm-l.xml
index faecd6a..ab98b40 100644
--- a/NumericalData/CDPP-AMDA/THEMIS/E/FGM/the-fgm-l.xml
+++ b/NumericalData/CDPP-AMDA/THEMIS/E/FGM/the-fgm-l.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -6,9 +5,9 @@
         <ResourceHeader>
             <ResourceName>0.25 sec (low)</ResourceName>
             <ReleaseDate>2015-10-14T15:59:00</ReleaseDate>
-            <Description/>
+            <Description />
             <Contact>
-                <!-- Uli Auster -->
+                
                 <PersonID>spase://SMWG/Person/Uli.Auster</PersonID>
                 <Role>TechnicalContact</Role>
             </Contact>
@@ -106,7 +105,7 @@
             </Field>
         </Parameter>
         <Parameter>
-            <Name>⎟b⎢</Name>
+            <Name>|b|</Name>
             <ParameterKey>the_bl_tot</ParameterKey>
             <Ucd>phys.magField</Ucd>
             <Units>nT</Units>
@@ -119,4 +118,4 @@
             </Field>
         </Parameter>
     </NumericalData>
-</Spase>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/THEMIS/E/FGM/the-fgm-s.xml b/NumericalData/CDPP-AMDA/THEMIS/E/FGM/the-fgm-s.xml
index aa178db..beba51a 100644
--- a/NumericalData/CDPP-AMDA/THEMIS/E/FGM/the-fgm-s.xml
+++ b/NumericalData/CDPP-AMDA/THEMIS/E/FGM/the-fgm-s.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -6,9 +5,9 @@
         <ResourceHeader>
             <ResourceName>3 sec (spin)</ResourceName>
             <ReleaseDate>2015-10-14T15:44:00</ReleaseDate>
-            <Description/>
+            <Description />
             <Contact>
-                <!-- Uli Auster -->
+                
                 <PersonID>spase://SMWG/Person/Uli.Auster</PersonID>
                 <Role>TechnicalContact</Role>
             </Contact>
@@ -107,7 +106,7 @@
             </Field>
         </Parameter>
         <Parameter>
-            <Name>⎟b⎢</Name>
+            <Name>|b|</Name>
             <ParameterKey>the_bs_tot</ParameterKey>
             <Ucd>phys.magField</Ucd>
             <Units>nT</Units>
@@ -120,4 +119,4 @@
             </Field>
         </Parameter>
     </NumericalData>
-</Spase>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/Voyager1/MAG/vo1-mag-full.xml b/NumericalData/CDPP-AMDA/Voyager1/MAG/vo1-mag-full.xml
index a725c57..f588cfc 100644
--- a/NumericalData/CDPP-AMDA/Voyager1/MAG/vo1-mag-full.xml
+++ b/NumericalData/CDPP-AMDA/Voyager1/MAG/vo1-mag-full.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -77,5 +76,5 @@
                 <FieldQuantity>Magnetic</FieldQuantity>
             </Field>
         </Parameter>
-     </NumericalData>
-</Spase>
+     <Parameter><Name>phi</Name><ParameterKey>vo1_b_full_phi</ParameterKey><Description>Magnetic field phi angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter><Parameter><Name>theta</Name><ParameterKey>vo1_b_full_theta</ParameterKey><Description>Magnetic field theta angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter></NumericalData>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/Voyager1/MAG/vo1-mag-juprtn.xml b/NumericalData/CDPP-AMDA/Voyager1/MAG/vo1-mag-juprtn.xml
index 6b16f63..d09f1e6 100644
--- a/NumericalData/CDPP-AMDA/Voyager1/MAG/vo1-mag-juprtn.xml
+++ b/NumericalData/CDPP-AMDA/Voyager1/MAG/vo1-mag-juprtn.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -87,5 +86,5 @@
                 <FieldQuantity>Magnetic</FieldQuantity>
             </Field>
         </Parameter>
-     </NumericalData>
-</Spase>
+     <Parameter><Name>phi</Name><ParameterKey>vo1_b_juprtn_phi</ParameterKey><Description>Magnetic field phi angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter><Parameter><Name>theta</Name><ParameterKey>vo1_b_juprtn_theta</ParameterKey><Description>Magnetic field theta angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter></NumericalData>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/Voyager1/MAG/vo1-mag-satrtn.xml b/NumericalData/CDPP-AMDA/Voyager1/MAG/vo1-mag-satrtn.xml
index bfdf93a..5fef578 100644
--- a/NumericalData/CDPP-AMDA/Voyager1/MAG/vo1-mag-satrtn.xml
+++ b/NumericalData/CDPP-AMDA/Voyager1/MAG/vo1-mag-satrtn.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -87,5 +86,5 @@
                 <FieldQuantity>Magnetic</FieldQuantity>
             </Field>
         </Parameter>
-     </NumericalData>
-</Spase>
+     <Parameter><Name>phi</Name><ParameterKey>vo1_b_satrtn_phi</ParameterKey><Description>Magnetic field phi angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter><Parameter><Name>theta</Name><ParameterKey>vo1_b_satrtn_theta</ParameterKey><Description>Magnetic field theta angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter></NumericalData>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/Voyager2/MAG/vo2-mag-full.xml b/NumericalData/CDPP-AMDA/Voyager2/MAG/vo2-mag-full.xml
index b335f0c..f9a1c5d 100644
--- a/NumericalData/CDPP-AMDA/Voyager2/MAG/vo2-mag-full.xml
+++ b/NumericalData/CDPP-AMDA/Voyager2/MAG/vo2-mag-full.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -6,7 +5,7 @@
         <ResourceHeader>
             <ResourceName>cruise</ResourceName>
             <ReleaseDate>2015-10-22T14:53:00.000Z</ReleaseDate>
-            <Description/>
+            <Description />
             <Contact>
                 <PersonID>spase://SMWG/Person/Elena.Budnik</PersonID>
                 <Role>TechnicalContact</Role>
@@ -79,5 +78,5 @@
                 <FieldQuantity>Magnetic</FieldQuantity>
             </Field>
         </Parameter>
-     </NumericalData>
-</Spase>
+     <Parameter><Name>phi</Name><ParameterKey>vo2_b_full_phi</ParameterKey><Description>Magnetic field phi angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter><Parameter><Name>theta</Name><ParameterKey>vo2_b_full_theta</ParameterKey><Description>Magnetic field theta angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter></NumericalData>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/Voyager2/MAG/vo2-mag-juprtn.xml b/NumericalData/CDPP-AMDA/Voyager2/MAG/vo2-mag-juprtn.xml
index 664d66e..6b5f2f6 100644
--- a/NumericalData/CDPP-AMDA/Voyager2/MAG/vo2-mag-juprtn.xml
+++ b/NumericalData/CDPP-AMDA/Voyager2/MAG/vo2-mag-juprtn.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -6,7 +5,7 @@
         <ResourceHeader>
             <ResourceName>rtn</ResourceName>
             <ReleaseDate>2015-10-22T14:54:00.000Z</ReleaseDate>
-            <Description/>
+            <Description />
             <Contact>
                 <PersonID>spase://SMWG/Person/Elena.Budnik</PersonID>
                 <Role>TechnicalContact</Role>
@@ -83,5 +82,5 @@
                 <FieldQuantity>Magnetic</FieldQuantity>
             </Field>
         </Parameter>
-     </NumericalData>
-</Spase>
+     <Parameter><Name>phi</Name><ParameterKey>vo2_b_juprtn_phi</ParameterKey><Description>Magnetic field phi angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter><Parameter><Name>theta</Name><ParameterKey>vo2_b_juprtn_theta</ParameterKey><Description>Magnetic field theta angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter></NumericalData>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/Voyager2/MAG/vo2-mag-neprtn.xml b/NumericalData/CDPP-AMDA/Voyager2/MAG/vo2-mag-neprtn.xml
index df38483..b70fd47 100644
--- a/NumericalData/CDPP-AMDA/Voyager2/MAG/vo2-mag-neprtn.xml
+++ b/NumericalData/CDPP-AMDA/Voyager2/MAG/vo2-mag-neprtn.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -6,7 +5,7 @@
         <ResourceHeader>
             <ResourceName>rtn</ResourceName>
             <ReleaseDate>2015-10-22T15:00:00.000Z</ReleaseDate>
-            <Description/>
+            <Description />
             <Contact>
                 <PersonID>spase://SMWG/Person/Elena.Budnik</PersonID>
                 <Role>TechnicalContact</Role>
@@ -83,5 +82,5 @@
                 <FieldQuantity>Magnetic</FieldQuantity>
             </Field>
         </Parameter>
-     </NumericalData>
-</Spase>
+     <Parameter><Name>phi</Name><ParameterKey>vo2_b_neprtn_phi</ParameterKey><Description>Magnetic field phi angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter><Parameter><Name>theta</Name><ParameterKey>vo2_b_neprtn_theta</ParameterKey><Description>Magnetic field theta angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter></NumericalData>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/Voyager2/MAG/vo2-mag-satrtn.xml b/NumericalData/CDPP-AMDA/Voyager2/MAG/vo2-mag-satrtn.xml
index b3b11bd..17c08bb 100644
--- a/NumericalData/CDPP-AMDA/Voyager2/MAG/vo2-mag-satrtn.xml
+++ b/NumericalData/CDPP-AMDA/Voyager2/MAG/vo2-mag-satrtn.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -6,7 +5,7 @@
         <ResourceHeader>
             <ResourceName>rtn</ResourceName>
             <ReleaseDate>2015-10-22T15:04:00.000Z</ReleaseDate>
-            <Description/>
+            <Description />
             <Contact>
                 <PersonID>spase://SMWG/Person/Elena.Budnik</PersonID>
                 <Role>TechnicalContact</Role>
@@ -83,5 +82,5 @@
                 <FieldQuantity>Magnetic</FieldQuantity>
             </Field>
         </Parameter>
-     </NumericalData>
-</Spase>
+     <Parameter><Name>phi</Name><ParameterKey>vo2_b_satrtn_phi</ParameterKey><Description>Magnetic field phi angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter><Parameter><Name>theta</Name><ParameterKey>vo2_b_satrtn_theta</ParameterKey><Description>Magnetic field theta angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter></NumericalData>
+</Spase>
\ No newline at end of file
diff --git a/NumericalData/CDPP-AMDA/Voyager2/MAG/vo2-mag-urartn.xml b/NumericalData/CDPP-AMDA/Voyager2/MAG/vo2-mag-urartn.xml
index 9203630..dcb0623 100644
--- a/NumericalData/CDPP-AMDA/Voyager2/MAG/vo2-mag-urartn.xml
+++ b/NumericalData/CDPP-AMDA/Voyager2/MAG/vo2-mag-urartn.xml
@@ -1,4 +1,3 @@
-<?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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
     <Version>2.3.1</Version>
     <NumericalData>
@@ -6,7 +5,7 @@
         <ResourceHeader>
             <ResourceName>rtn</ResourceName>
             <ReleaseDate>2015-10-22T15:05:00.000Z</ReleaseDate>
-            <Description/>
+            <Description />
             <Contact>
                 <PersonID>spase://SMWG/Person/Elena.Budnik</PersonID>
                 <Role>TechnicalContact</Role>
@@ -83,5 +82,5 @@
                 <FieldQuantity>Magnetic</FieldQuantity>
             </Field>
         </Parameter>
-     </NumericalData>
-</Spase>
+     <Parameter><Name>phi</Name><ParameterKey>vo2_b_urartn_phi</ParameterKey><Description>Magnetic field phi angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter><Parameter><Name>theta</Name><ParameterKey>vo2_b_urartn_theta</ParameterKey><Description>Magnetic field theta angle</Description><Ucd>phys.magField</Ucd><Units>degrees</Units><UnitsConversion>1e-9&amp;gt;T</UnitsConversion><RenderingHints><DisplayType>TimeSeries</DisplayType></RenderingHints><Structure><Size>1</Size></Structure></Parameter></NumericalData>
+</Spase>
\ No newline at end of file
--
libgit2 0.21.2