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/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
--
libgit2 0.21.2