merge

author: Leif Johansson <leifj@sunet.se> 2019-11-20 08:35:28 +0100
committer: Leif Johansson <leifj@sunet.se> 2019-11-20 08:35:28 +0100
commit: 07b2ea84983d757b346a4c45e759aeee3267e6ea (patch)
tree: 04e9b37b1e51ad8706a179230c566cdbd947feab /swamid-2.0
parent: 922f80dcb442c0a7d51dedd6052b0e44c4d45148 (diff)
195 files changed, 1124 insertions, 1058 deletions
diff --git a/swamid-2.0/1827881.mediaspace.kaltura.com.xml b/swamid-2.0/1827881.mediaspace.kaltura.com.xml
index 5b3b5288..876a93a8 100644
--- a/swamid-2.0/1827881.mediaspace.kaltura.com.xml
+++ b/swamid-2.0/1827881.mediaspace.kaltura.com.xml
@@ -29,13 +29,13 @@
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://1827881.mediaspace.kaltura.com/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Old KauPlay</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Old KauPlay</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://1827881.mediaspace.kaltura.com</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:SurName>Administrator</md:SurName>
     <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/7t.lbic.lu.se.xml b/swamid-2.0/7t.lbic.lu.se.xml
index 7978d5cc..f4c14305 100644
--- a/swamid-2.0/7t.lbic.lu.se.xml
+++ b/swamid-2.0/7t.lbic.lu.se.xml
@@ -40,9 +40,9 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://7t.lbic.lu.se/simplesaml/module.php/saml/sp/saml2-acs.php/7t" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://7t.lbic.lu.se/simplesaml/module.php/saml/sp/saml1-acs.php/7t/artifact" index="3"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>Anders</md:GivenName>
     <md:SurName>Mårtensson</md:SurName>
     <md:EmailAddress>mailto:Anders.Martensson@med.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/acc-nais.uhr.se-shibboleth.xml b/swamid-2.0/acc-nais.uhr.se-shibboleth.xml
index 695620d8..94a27ea5 100644
--- a/swamid-2.0/acc-nais.uhr.se-shibboleth.xml
+++ b/swamid-2.0/acc-nais.uhr.se-shibboleth.xml
@@ -90,9 +90,9 @@ BwquFopAQg==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://acc-nais.uhr.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://acc-nais.uhr.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>Carina</md:GivenName>
     <md:SurName>Lindström</md:SurName>
     <md:EmailAddress>mailto:support@reqtest-services.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/account-idac.ki.se-shibboleth.xml b/swamid-2.0/account-idac.ki.se-shibboleth.xml
index 5974baae..07299441 100644
--- a/swamid-2.0/account-idac.ki.se-shibboleth.xml
+++ b/swamid-2.0/account-idac.ki.se-shibboleth.xml
@@ -116,14 +116,14 @@ kSL+CA/rbpXwRm3nHNg1rnjc3bw7VZn6mPa66U0FisLPsrkcuYS+AZAdA0fO02bL
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account.ki.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://account.ki.se/Shibboleth.sso/SAML2/ECP" index="4"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>Eric</md:GivenName>
     <md:SurName>Johansson</md:SurName>
     <md:EmailAddress>mailto:eric.johansson@ki.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
+  </md:ContactPerson><md:ContactPerson contactType="support">
     <md:GivenName>IT-support</md:GivenName>
     <md:EmailAddress>mailto:it-support@ki.se</md:EmailAddress>
     <md:TelephoneNumber>+46852482222</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/account-utv.hh.se-shibboleth.xml b/swamid-2.0/account-utv.hh.se-shibboleth.xml
index af6b4169..41a94bbf 100644
--- a/swamid-2.0/account-utv.hh.se-shibboleth.xml
+++ b/swamid-2.0/account-utv.hh.se-shibboleth.xml
@@ -96,15 +96,15 @@ SkvUGlQ34ywYDYG3PMSs2Bks6PnClNWyuRjz0pPAThDxeEAJfYPkB+3EGFuHd9bb
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://account-utv.hh.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://account-utv.hh.se/Shibboleth.sso/SAML2/ECP" index="4"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Högskolan i Halmstad</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Högskolan i Halmstad</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.hh.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:Company>Högskolan i Halmstad</md:Company>
     <md:GivenName>Björn</md:GivenName>
     <md:SurName>Gabrielsson</md:SurName>
     <md:EmailAddress>mailto:bjorn.gabrielsson@hh.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/acs-ra21.mnt.se-shibboleth.xml b/swamid-2.0/acs-ra21.mnt.se-shibboleth.xml
index 6d0c7e9e..e2a587e0 100644
--- a/swamid-2.0/acs-ra21.mnt.se-shibboleth.xml
+++ b/swamid-2.0/acs-ra21.mnt.se-shibboleth.xml
@@ -78,14 +78,14 @@ LfzIVIx1AEnE4NLSJyoJgzDiq8xvKC04IIyrZNaVPn8+00UMkZ8Jyg==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://acs-ra21.mnt.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://acs-ra21.mnt.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">The RA21 Project</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Resource Access for the 21st Century (RA21)</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://ra21.org</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:GivenName>SWAMID</md:GivenName>
     <md:SurName>Operations</md:SurName>
     <md:EmailAddress>mailto:operations@swamid.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/adfs.ju.se-adfs-services-trust.xml b/swamid-2.0/adfs.ju.se-adfs-services-trust.xml
index 3f933286..dcd6a25a 100644
--- a/swamid-2.0/adfs.ju.se-adfs-services-trust.xml
+++ b/swamid-2.0/adfs.ju.se-adfs-services-trust.xml
@@ -47,5 +47,5 @@
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adfs.ju.se/adfs/ls/" index="1"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.ju.se/adfs/ls/" index="2"/>
   </SPSSODescriptor>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support"/>
-</md:EntityDescriptor>
+  
+<ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support"/></md:EntityDescriptor>
diff --git a/swamid-2.0/adfs.test.umu.se-adfs-services-trust.xml b/swamid-2.0/adfs.test.umu.se-adfs-services-trust.xml
index 23fb828e..74dc816f 100644
--- a/swamid-2.0/adfs.test.umu.se-adfs-services-trust.xml
+++ b/swamid-2.0/adfs.test.umu.se-adfs-services-trust.xml
@@ -85,10 +85,10 @@
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.test.umu.se/adfs/ls/"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.test.umu.se/adfs/ls/"/>
   </IDPSSODescriptor>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+  
+<ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <Company>Umeå University</Company>
     <SurName>ITS datordrift</SurName>
     <EmailAddress>mailto:datordrift@its.umu.se</EmailAddress>
     <TelephoneNumber>+46 90 786 6300</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/adfs.umu.se-adfs-services-trust.xml b/swamid-2.0/adfs.umu.se-adfs-services-trust.xml
index 4853d210..13356741 100644
--- a/swamid-2.0/adfs.umu.se-adfs-services-trust.xml
+++ b/swamid-2.0/adfs.umu.se-adfs-services-trust.xml
@@ -56,35 +56,35 @@
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.umu.se/adfs/ls/"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.umu.se/adfs/ls/"/>
   </IDPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+  
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="sv">Umeå universitet</OrganizationName>
     <OrganizationName xml:lang="en">Umea University</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Umeå universitet</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Umeå University</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv">https://www.umu.se/</OrganizationURL>
     <OrganizationURL xml:lang="en">https://www.umu.se/en</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>Umeå University</Company>
     <SurName>ITS datordrift</SurName>
     <EmailAddress>mailto:datordrift@its.umu.se</EmailAddress>
     <TelephoneNumber>+46 90 786 6300</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>Umeå University</Company>
     <SurName>ITS datordrift</SurName>
     <EmailAddress>mailto:datordrift@its.umu.se</EmailAddress>
     <TelephoneNumber>+46 90 786 6300</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <Company>Umeå University</Company>
     <SurName>ITS datordrift</SurName>
     <EmailAddress>mailto:datordrift@its.umu.se</EmailAddress>
     <TelephoneNumber>+46 90 786 6300</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+  </ContactPerson><ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
     <GivenName>UmU Incident Response Team</GivenName>
     <EmailAddress>mailto:abuse@umu.se</EmailAddress>
     <TelephoneNumber>+46 90 786 6300</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/administrationsverktyg.test.umu.se-shibboleth.xml b/swamid-2.0/administrationsverktyg.test.umu.se-shibboleth.xml
index 96f579a2..8c80c2c5 100644
--- a/swamid-2.0/administrationsverktyg.test.umu.se-shibboleth.xml
+++ b/swamid-2.0/administrationsverktyg.test.umu.se-shibboleth.xml
@@ -96,9 +96,9 @@ rNkzHliVfNgyZqak7Ay9DNyx8hSt/1/CBfgQsPjOLxpyKxGIdME86uCTbe32i9mz
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://administrationsverktyg.test.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://administrationsverktyg.test.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
+  
+<md:ContactPerson contactType="administrative">
     <md:GivenName>Tommy</md:GivenName>
     <md:SurName>Larsson</md:SurName>
     <md:EmailAddress>mailto:tommy.larsson@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/akka-adm.demo.its.uu.se-shibboleth.xml b/swamid-2.0/akka-adm.demo.its.uu.se-shibboleth.xml
index fcb5552c..3a595da3 100644
--- a/swamid-2.0/akka-adm.demo.its.uu.se-shibboleth.xml
+++ b/swamid-2.0/akka-adm.demo.its.uu.se-shibboleth.xml
@@ -56,15 +56,15 @@ xxDg6j9aNkDMliUUAe6tc0OcQkp0gbwwFzJMT/qq8K7AfKlX8vES9Q==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://akka-adm.demo.its.uu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://akka-adm.demo.its.uu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Uppsala universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.uu.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
+  </md:Organization><md:ContactPerson contactType="support">
     <md:Company>Uppsala universitet</md:Company>
     <md:SurName>IT Servicedesk</md:SurName>
     <md:EmailAddress>mailto:helpdesk@uu.se</md:EmailAddress>
     <md:TelephoneNumber>+46 18 4714400</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/anvandare.antagning.se-anvandare-sp.xml b/swamid-2.0/anvandare.antagning.se-anvandare-sp.xml
index 059dc243..331115fd 100644
--- a/swamid-2.0/anvandare.antagning.se-anvandare-sp.xml
+++ b/swamid-2.0/anvandare.antagning.se-anvandare-sp.xml
@@ -92,28 +92,28 @@ BXkD3pP3Jve52w==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://anvandare.antagning.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://anvandare.antagning.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+  
+  
+<md:Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <md:OrganizationName xml:lang="en">Swedish Council for Higher Education</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">www.uhr.se</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">www.uhr.se/en</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.uhr.se/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+  </md:Organization><md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <md:Company>Swedish Council for Higher Education</md:Company>
     <md:SurName>UHR Systemdrift</md:SurName>
     <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
     <md:TelephoneNumber>+46 10 470 06 28</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </md:ContactPerson><md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <md:Company>Swedish Council for Higher Education</md:Company>
     <md:SurName>Håkan Pettersson</md:SurName>
     <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
     <md:TelephoneNumber>+46 10 470 06 28</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+  </md:ContactPerson><md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <md:Company>Swedish Council for Higher Education</md:Company>
     <md:SurName>UHR Systemdrift</md:SurName>
     <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
     <md:TelephoneNumber>+46 10 470 06 28</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/artisan-idp.sunet.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/artisan-idp.sunet.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index d36fd7b4..880cc89a 100644
--- a/swamid-2.0/artisan-idp.sunet.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/artisan-idp.sunet.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -37,9 +37,9 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://artisan-idp.sunet.se/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://artisan-idp.sunet.se/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="4"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>SUNET</md:GivenName>
     <md:SurName>NOC</md:SurName>
     <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/artisan-saas-idp-proxy.sunet.se-sp.xml b/swamid-2.0/artisan-saas-idp-proxy.sunet.se-sp.xml
index 2c10312e..8fbf1f55 100644
--- a/swamid-2.0/artisan-saas-idp-proxy.sunet.se-sp.xml
+++ b/swamid-2.0/artisan-saas-idp-proxy.sunet.se-sp.xml
@@ -87,17 +87,17 @@ HGYrlNKYma5Wmcg0BqTiZPbh4Z8VWJBWGHIGND3F23ElplSxM+j63k4=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://artisan-saas-idp-proxy.sunet.se/Saml2SP/acs/post" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://artisan-saas-idp-proxy.sunet.se/Saml2SP/acs/redirect" index="2"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">SUNET Survey</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">SUNET Survey</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:GivenName>Technical</md:GivenName>
     <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
+  </md:ContactPerson><md:ContactPerson contactType="support">
     <md:GivenName>Support</md:GivenName>
     <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/auth.fieldsites.se-saml-cpauth.xml b/swamid-2.0/auth.fieldsites.se-saml-cpauth.xml
index b20eecee..afe6b894 100644
--- a/swamid-2.0/auth.fieldsites.se-saml-cpauth.xml
+++ b/swamid-2.0/auth.fieldsites.se-saml-cpauth.xml
@@ -87,14 +87,14 @@ ut7vQ9gFxIHIfE526gVIlHUomwr6JGU=
       <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">SITES Data Portal</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">SITES Data Portal</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.fieldsites.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:GivenName>Oleg</md:GivenName>
     <md:SurName>Mirzov</md:SurName>
     <md:EmailAddress>mailto:oleg.mirzov@nateko.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/beta.augustus.se.xml b/swamid-2.0/beta.augustus.se.xml
index 213e73d2..8b4e39c4 100644
--- a/swamid-2.0/beta.augustus.se.xml
+++ b/swamid-2.0/beta.augustus.se.xml
@@ -15,15 +15,15 @@
     </KeyDescriptor>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://beta.augustus.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
   </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="en">Genuine Text</OrganizationName>
     <OrganizationDisplayName xml:lang="en">Genuine Text</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.genuinetext.com</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>Know Net AB</Company>
     <GivenName>Ingemar</GivenName>
     <SurName>Lundström</SurName>
     <EmailAddress>mailto:ingemar.lundstrom@knownet.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 9bc91d89..fc1932bb 100644
--- a/swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -58,14 +58,14 @@
       <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonEntitlement" isRequired="false"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">NORDUnet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">NORDUnet A/S</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:GivenName>NORDUNet</md:GivenName>
     <md:SurName>NOC</md:SurName>
     <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/box-idp.nordu.net-simplesaml-saml2-idp-metadata.php.xml b/swamid-2.0/box-idp.nordu.net-simplesaml-saml2-idp-metadata.php.xml
index 0402c713..7445ca1b 100644
--- a/swamid-2.0/box-idp.nordu.net-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-2.0/box-idp.nordu.net-simplesaml-saml2-idp-metadata.php.xml
@@ -24,9 +24,9 @@
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://box-idp.nordu.net/simplesaml/saml2/idp/SSOService.php"/>
   </md:IDPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>NORDUNet</md:GivenName>
     <md:SurName>NOC</md:SurName>
     <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/box-idp.sunet.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/box-idp.sunet.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index e4f95631..99ae9082 100644
--- a/swamid-2.0/box-idp.sunet.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/box-idp.sunet.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -42,9 +42,9 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://box-idp.sunet.se/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://box-idp.sunet.se/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>SUNET</md:GivenName>
     <md:SurName>NOC</md:SurName>
     <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/box-idp.sunet.se-simplesaml-saml2-idp-metadata.php.xml b/swamid-2.0/box-idp.sunet.se-simplesaml-saml2-idp-metadata.php.xml
index 567a8af9..c9d3f154 100644
--- a/swamid-2.0/box-idp.sunet.se-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-2.0/box-idp.sunet.se-simplesaml-saml2-idp-metadata.php.xml
@@ -24,9 +24,9 @@
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://box-idp.sunet.se/simplesaml/saml2/idp/SSOService.php"/>
   </md:IDPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>SUNET</md:GivenName>
     <md:SurName>NOC</md:SurName>
     <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/box.net.xml b/swamid-2.0/box.net.xml
index 4303be1a..94260ce5 100644
--- a/swamid-2.0/box.net.xml
+++ b/swamid-2.0/box.net.xml
@@ -34,10 +34,10 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.services.box.net/sp/ACS.saml2" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sso.services.box.net/sp/ACS.saml2" index="2"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
+  
+<md:ContactPerson contactType="administrative">
     <md:Company>Box.net</md:Company>
     <md:GivenName>Box</md:GivenName>
     <md:SurName>Support</md:SurName>
     <md:EmailAddress>mailto:business-support@box.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/brandkeeper.se-wsfed.xml b/swamid-2.0/brandkeeper.se-wsfed.xml
index 22c631df..1dd51a6d 100644
--- a/swamid-2.0/brandkeeper.se-wsfed.xml
+++ b/swamid-2.0/brandkeeper.se-wsfed.xml
@@ -38,13 +38,13 @@
       <RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
     </AttributeConsumingService>
   </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="en">Incited AB</OrganizationName>
     <OrganizationDisplayName xml:lang="en">Brandkeeper</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.brandkeeper.se/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <EmailAddress>mailto:support@brandkeeper.se</EmailAddress>
     <TelephoneNumber>+46 470 771 440</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/calypso.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/calypso.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 4dd9eacf..50b02832 100644
--- a/swamid-2.0/calypso.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/calypso.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -42,8 +42,8 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://calypso.sau.kau.se/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://calypso.sau.kau.se/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:SurName>IT-avdelningen</md:SurName>
     <md:EmailAddress>mailto:webbteknik@kau.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/client200-151.its.umu.se-shibboleth.xml b/swamid-2.0/client200-151.its.umu.se-shibboleth.xml
index 1ea5694c..412c8c76 100644
--- a/swamid-2.0/client200-151.its.umu.se-shibboleth.xml
+++ b/swamid-2.0/client200-151.its.umu.se-shibboleth.xml
@@ -90,9 +90,9 @@ a0EsY32piHtFDD51gh4rI8GPrW6p/iP1w7REWkZq0yIrTpEI
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://client200-151.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://client200-151.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
+  
+<md:ContactPerson contactType="administrative">
     <md:GivenName>Tommy</md:GivenName>
     <md:SurName>Larsson</md:SurName>
     <md:EmailAddress>mailto:tommy.larsson@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/confluence.it.su.se-shibboleth.sso.xml b/swamid-2.0/confluence.it.su.se-shibboleth.sso.xml
index ffa8c5fb..c4e3d0b4 100644
--- a/swamid-2.0/confluence.it.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/confluence.it.su.se-shibboleth.sso.xml
@@ -88,8 +88,8 @@ qVpQDZd93P9YLQGNulZ1J4JdseJC6nAeXZY+iAiEBCyhx0+NQnlt+BZt7m76yNYi
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://confluence.it.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://confluence.it.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:SurName>IT-avdelningen</md:SurName>
     <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/connect-lab.sunet.se-shibboleth.xml b/swamid-2.0/connect-lab.sunet.se-shibboleth.xml
index a62d335d..f06aa720 100644
--- a/swamid-2.0/connect-lab.sunet.se-shibboleth.xml
+++ b/swamid-2.0/connect-lab.sunet.se-shibboleth.xml
@@ -85,13 +85,13 @@ W7Kcs4Airg==
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://connect-lab.sunet.se/Shibboleth.sso/SLO/Artifact"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connect-lab.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">NORDUnet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">NORDUnet A/S</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:Company>NORDUnet NOC</md:Company>
     <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/connect.sunet.se-shibboleth.xml b/swamid-2.0/connect.sunet.se-shibboleth.xml
index 8bfc6d2d..f8060e5b 100644
--- a/swamid-2.0/connect.sunet.se-shibboleth.xml
+++ b/swamid-2.0/connect.sunet.se-shibboleth.xml
@@ -105,13 +105,13 @@ bUs=
       <md:RequestedAttribute isRequired="true" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">NORDUnet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">NORDUnet A/S</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:Company>NORDUnet NOC</md:Company>
     <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/cpauth.icos-cp.eu-saml-cpauth.xml b/swamid-2.0/cpauth.icos-cp.eu-saml-cpauth.xml
index 1654ae74..3477ff04 100644
--- a/swamid-2.0/cpauth.icos-cp.eu-saml-cpauth.xml
+++ b/swamid-2.0/cpauth.icos-cp.eu-saml-cpauth.xml
@@ -88,14 +88,14 @@ D265cqy6Le/toVg=
       <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">ICOS Carbon Portal</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Carbon Portal</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://icos-cp.eu/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:GivenName>Oleg</md:GivenName>
     <md:SurName>Mirzov</md:SurName>
     <md:EmailAddress>mailto:oleg.mirzov@nateko.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/crowd.nordu.net-shibboleth.xml b/swamid-2.0/crowd.nordu.net-shibboleth.xml
index 8d091215..3fac81b0 100644
--- a/swamid-2.0/crowd.nordu.net-shibboleth.xml
+++ b/swamid-2.0/crowd.nordu.net-shibboleth.xml
@@ -100,13 +100,13 @@ Neib9lWMnEYRIynoqQE3UXYnb3GDinEg/soKH73QAq0dyjcfuk30FA==
       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">NORDUnet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">NORDUnet A/S</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:Company>NORDUnet</md:Company>
     <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/crowd01.ub.uu.se-plugins-servlet-ssocookie.xml b/swamid-2.0/crowd01.ub.uu.se-plugins-servlet-ssocookie.xml
index 01b71e5d..d25798d9 100644
--- a/swamid-2.0/crowd01.ub.uu.se-plugins-servlet-ssocookie.xml
+++ b/swamid-2.0/crowd01.ub.uu.se-plugins-servlet-ssocookie.xml
@@ -59,18 +59,18 @@ pwwo31oLM3LMmsuvcpbNjJ8v7xPiB5TwrNObseH8dICPaGA=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crowd01.ub.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://crowd01.ub.uu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Uppsala University Library</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Uppsala universitetsbibliotek</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Uppsala University Library</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Uppsala universitetsbibliotek</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">http://ub.uu.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://ub.uu.se/?languageId=1</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:Company>Uppsala University Library</md:Company>
     <md:GivenName>Rasmus</md:GivenName>
     <md:SurName>Skagersten</md:SurName>
     <md:EmailAddress>mailto:helpdesk@ub.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/cwd.ub.uu.se-crowd-plugins-servlet-ssocookie.xml b/swamid-2.0/cwd.ub.uu.se-crowd-plugins-servlet-ssocookie.xml
index f557dd40..6e237507 100644
--- a/swamid-2.0/cwd.ub.uu.se-crowd-plugins-servlet-ssocookie.xml
+++ b/swamid-2.0/cwd.ub.uu.se-crowd-plugins-servlet-ssocookie.xml
@@ -59,18 +59,18 @@ SULb2eGULK5t37tA/bB0/ziN+psCe+MfZQEEZTf+6cE=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cwd.ub.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cwd.ub.uu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Uppsala University Library</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Uppsala universitetsbibliotek</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Uppsala University Library</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Uppsala universitetsbibliotek</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">http://ub.uu.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://ub.uu.se/?languageId=1</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:Company>Uppsala University Library</md:Company>
     <md:GivenName>Rasmus</md:GivenName>
     <md:SurName>Skagersten</md:SurName>
     <md:EmailAddress>mailto:helpdesk@ub.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/daisy.ict.kth.se-shibboleth.xml b/swamid-2.0/daisy.ict.kth.se-shibboleth.xml
index 0484d0b3..38d0a1d3 100644
--- a/swamid-2.0/daisy.ict.kth.se-shibboleth.xml
+++ b/swamid-2.0/daisy.ict.kth.se-shibboleth.xml
@@ -68,24 +68,24 @@ QhkStwIG6VXQAVJpMKGblsSIk+TqRD1okkUSY5BHAob80RAoOCmbhw==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://daisy.ict.kth.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://daisy.ict.kth.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
+  
+  
+  
+  
+<md:ContactPerson contactType="administrative">
     <md:Company>DSV, Stockholm University</md:Company>
     <md:GivenName>DMC</md:GivenName>
     <md:EmailAddress>mailto:dmc@dsv.su.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:Company>DSV, Stockholm University</md:Company>
     <md:GivenName>DMC</md:GivenName>
     <md:EmailAddress>mailto:dmc@dsv.su.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
+  </md:ContactPerson><md:ContactPerson contactType="support">
     <md:Company>DSV, Stockholm University</md:Company>
     <md:GivenName>DMC</md:GivenName>
     <md:EmailAddress>mailto:dmc@dsv.su.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:Company>DSV, Stockholm University</md:Company>
     <md:GivenName>Security DMC</md:GivenName>
     <md:EmailAddress>mailto:incident@dsv.su.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/daisy2.dsv.su.se-shibboleth.xml b/swamid-2.0/daisy2.dsv.su.se-shibboleth.xml
index 5c82e150..dee2034b 100644
--- a/swamid-2.0/daisy2.dsv.su.se-shibboleth.xml
+++ b/swamid-2.0/daisy2.dsv.su.se-shibboleth.xml
@@ -97,24 +97,24 @@ z5YBnMaQJe+rBcMSFlxo5Iw8sVICkj3tKC9gROCAXNqi0/w1RA==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://daisy2.dsv.su.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://daisy2.dsv.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
+  
+  
+  
+  
+<md:ContactPerson contactType="administrative">
     <md:Company>DSV, Stockholm University</md:Company>
     <md:GivenName>DMC</md:GivenName>
     <md:EmailAddress>mailto:dmc@dsv.su.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:Company>DSV, Stockholm University</md:Company>
     <md:GivenName>DMC</md:GivenName>
     <md:EmailAddress>mailto:dmc@dsv.su.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
+  </md:ContactPerson><md:ContactPerson contactType="support">
     <md:Company>DSV, Stockholm University</md:Company>
     <md:GivenName>DMC</md:GivenName>
     <md:EmailAddress>mailto:dmc@dsv.su.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:Company>DSV, Stockholm University</md:Company>
     <md:GivenName>Security DMC</md:GivenName>
     <md:EmailAddress>mailto:incident@dsv.su.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/dedserv79.levonline.com-shibboleth.xml b/swamid-2.0/dedserv79.levonline.com-shibboleth.xml
index 6eca94a8..3618c717 100644
--- a/swamid-2.0/dedserv79.levonline.com-shibboleth.xml
+++ b/swamid-2.0/dedserv79.levonline.com-shibboleth.xml
@@ -34,15 +34,15 @@ qlG83cbyWydqYCCYruAVslAykrwfBXAXdCs4YBs=</ds:X509Certificate>
     </KeyDescriptor>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dedserv79.levonline.com/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
   </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="en">Emanuel</OrganizationName>
     <OrganizationDisplayName xml:lang="en">Emanuel AB</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.emanuel.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>Emanuel AB</Company>
     <GivenName>Fredrik</GivenName>
     <SurName>Näslund</SurName>
     <EmailAddress>mailto:fredrik.naslund@emanuel.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/dev.cloudmore.com-shibboleth.xml b/swamid-2.0/dev.cloudmore.com-shibboleth.xml
index 3d3d4a5a..d14fd5c5 100644
--- a/swamid-2.0/dev.cloudmore.com-shibboleth.xml
+++ b/swamid-2.0/dev.cloudmore.com-shibboleth.xml
@@ -93,12 +93,12 @@ KG+MY9n4aaqecV40ScxWptqZOJPVWBH4Yh1BocVylDM=
       <md:RequestedAttribute FriendlyName="eppn" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Cloudmore AB</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Cloudmore</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.cloudmore.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:EmailAddress>mailto:support@cloudmore.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/dev.lararlyftet-validering.se-shibboleth.xml b/swamid-2.0/dev.lararlyftet-validering.se-shibboleth.xml
index 721b747a..1c64a9d6 100644
--- a/swamid-2.0/dev.lararlyftet-validering.se-shibboleth.xml
+++ b/swamid-2.0/dev.lararlyftet-validering.se-shibboleth.xml
@@ -92,9 +92,9 @@ JPCgGoM1ape2Nyf198u6F4qXp5MZsS+vBOXxAyvHzWOr5uMzxg0oAJQwpkVp/b2z
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.lararlyftet-validering.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.lararlyftet-validering.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>Carina</md:GivenName>
     <md:SurName>Lindström</md:SurName>
     <md:EmailAddress>mailto:valdasupport@uhr.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/dev.play.bth.se.xml b/swamid-2.0/dev.play.bth.se.xml
index 972cf908..4a2ecdcb 100644
--- a/swamid-2.0/dev.play.bth.se.xml
+++ b/swamid-2.0/dev.play.bth.se.xml
@@ -38,13 +38,13 @@
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.play.bth.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">BTH (DEV)</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">BTH (DEV)</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://dev.play.bth.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:SurName>Administrator</md:SurName>
     <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/dev.valda.uhr.se-shibboleth.xml b/swamid-2.0/dev.valda.uhr.se-shibboleth.xml
index ee703f2e..9e442d22 100644
--- a/swamid-2.0/dev.valda.uhr.se-shibboleth.xml
+++ b/swamid-2.0/dev.valda.uhr.se-shibboleth.xml
@@ -89,9 +89,9 @@ JPCgGoM1ape2Nyf198u6F4qXp5MZsS+vBOXxAyvHzWOr5uMzxg0oAJQwpkVp/b2z
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.valda.uhr.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.valda.uhr.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>Carina</md:GivenName>
     <md:SurName>Lindström</md:SurName>
     <md:EmailAddress>mailto:valdasupport@uhr.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/devsp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/devsp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml
index 22f435fe..412780fb 100644
--- a/swamid-2.0/devsp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/devsp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml
@@ -49,16 +49,16 @@
       <md:RequestedAttribute Name="urn:oid:2.5.4.42" FriendlyName="givenName"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="sv">Svensk Nationell Datatjänst</md:OrganizationName>
     <md:OrganizationName xml:lang="en">Swedish National Data Service</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Svensk Nationell Datatjänst</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Swedish National Data Service</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://snd.gu.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:GivenName>SND</md:GivenName>
     <md:SurName>Administrator</md:SurName>
     <md:EmailAddress>mailto:webmaster@snd.gu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/devsp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/devsp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml
index 1b7c47eb..b3ed11f0 100644
--- a/swamid-2.0/devsp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/devsp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml
@@ -40,9 +40,9 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://devsp.sweclarin.se/sp/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://devsp.sweclarin.se/sp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>Pablo</md:GivenName>
     <md:SurName>Millet</md:SurName>
     <md:EmailAddress>mailto:pablo.millet@gu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/dnsrpz-lookup.sunet.se-shibboleth.xml b/swamid-2.0/dnsrpz-lookup.sunet.se-shibboleth.xml
index 7c4792c3..995ac3bc 100644
--- a/swamid-2.0/dnsrpz-lookup.sunet.se-shibboleth.xml
+++ b/swamid-2.0/dnsrpz-lookup.sunet.se-shibboleth.xml
@@ -96,27 +96,27 @@ EeUbmUOSeuWKXMTZJOVS1XLYfDqdjupWCgOOa4cGJzWCGIZECBaxPXQEiZbOEEtA
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dnsrpz-lookup.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dnsrpz-lookup.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="sv">Swedish University Network</md:OrganizationName>
     <md:OrganizationName xml:lang="en">Swedish University Network</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">SUNET</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en"> SUNET</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://www.sunet.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
+  </md:Organization><md:ContactPerson contactType="administrative">
     <md:Company>SUNET</md:Company>
     <md:SurName>Pettai</md:SurName>
     <md:EmailAddress>mailto:pettai@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:Company>SUNET</md:Company>
     <md:SurName>Pettai</md:SurName>
     <md:EmailAddress>mailto:pettai@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
+  </md:ContactPerson><md:ContactPerson contactType="support">
     <md:Company>SUNET</md:Company>
     <md:SurName>Servicedesk Umeå universitet</md:SurName>
     <md:EmailAddress>mailto:pettai@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/du.hr.evry.se-shibboleth.xml b/swamid-2.0/du.hr.evry.se-shibboleth.xml
index a2fc14a2..507c7a16 100644
--- a/swamid-2.0/du.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/du.hr.evry.se-shibboleth.xml
@@ -76,14 +76,14 @@ DTGN04FIC5s+8yFP1O/+RrQ8DQRmS/dfyc8iOXxm5vsWIVAnwD5nX5WrSp4=
       <md:RequestedAttribute FriendlyName="eppn" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Evry HR Solutions AB</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Evry HR Solutions AB</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.evry.se/it-tjanster/applikationstjanster-och-losningar/personal-och-lonesystem/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
+  </md:Organization><md:ContactPerson contactType="support">
     <md:GivenName>Primula</md:GivenName>
     <md:SurName>Support</md:SurName>
     <md:EmailAddress>mailto:primulasupport@evry.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/edit-utb.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/edit-utb.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index d7159094..4698f8f6 100644
--- a/swamid-2.0/edit-utb.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/edit-utb.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -40,8 +40,8 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edit-utb.kau.se/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://edit-utb.kau.se/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>IT-avdelningen</md:GivenName>
     <md:EmailAddress>mailto:webbteknik@kau.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/edit.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/edit.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index a1692bcd..043d48df 100644
--- a/swamid-2.0/edit.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/edit.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -40,8 +40,8 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edit.kau.se/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://edit.kau.se/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>IT-avdelningen</md:GivenName>
     <md:EmailAddress>mailto:webbteknik@kau.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/eduroamkonto.kau.se.xml b/swamid-2.0/eduroamkonto.kau.se.xml
index aa418d30..480fc89e 100644
--- a/swamid-2.0/eduroamkonto.kau.se.xml
+++ b/swamid-2.0/eduroamkonto.kau.se.xml
@@ -97,8 +97,8 @@ MipqdDjyQEIn6175q9gOmemKMbk=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://eduroamkonto-staging.kau.se/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eduroamkonto-staging.kau.se/Shibboleth.sso/SAML2/POST" index="7"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:SurName>IT-avdelningen</md:SurName>
     <md:EmailAddress>mailto:webbteknik@kau.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/emrex-test.its.umu.se-shibboleth.xml b/swamid-2.0/emrex-test.its.umu.se-shibboleth.xml
index 7190a5b5..48a11383 100644
--- a/swamid-2.0/emrex-test.its.umu.se-shibboleth.xml
+++ b/swamid-2.0/emrex-test.its.umu.se-shibboleth.xml
@@ -98,9 +98,9 @@ Rh2KVHAiKOIu9nyDsz3aAY17J2ju15aJRQc=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://emrex-test.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://emrex-test.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
+  
+<md:ContactPerson contactType="administrative">
     <md:GivenName>Risto</md:GivenName>
     <md:SurName>Järvi</md:SurName>
     <md:EmailAddress>mailto:risto.jarvi@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/exitpoll.stu.lu.se-shibboleth.xml b/swamid-2.0/exitpoll.stu.lu.se-shibboleth.xml
index 274e3d06..fabbdd21 100644
--- a/swamid-2.0/exitpoll.stu.lu.se-shibboleth.xml
+++ b/swamid-2.0/exitpoll.stu.lu.se-shibboleth.xml
@@ -82,22 +82,22 @@ u21VH/EFiu9zEqiF00OIOqKPItb7pgRaWF9pf1OyAmh8t9I2FjTvUG42nLMJr62+
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://exitpoll.stu.lu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://exitpoll.stu.lu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="sv">LU</md:OrganizationName>
     <md:OrganizationName xml:lang="en">LU</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Exitpoll - Doktorand avslutande enkät</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Exitpoll - Doktorand Exit poll</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">http://www.lu.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.lunduniversity.lu.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:GivenName>Martin</md:GivenName>
     <md:SurName>Åhfeldt</md:SurName>
     <md:EmailAddress>mailto:martin.ahfeldt@ldc.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
+  </md:ContactPerson><md:ContactPerson contactType="support">
     <md:GivenName>Exitpoll</md:GivenName>
     <md:SurName>LU Servicedesk</md:SurName>
     <md:EmailAddress>mailto:mailto:servicedesk@lu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/filesender.sunet.se-shibboleth.xml b/swamid-2.0/filesender.sunet.se-shibboleth.xml
index 5fdf3018..c2a68b1f 100644
--- a/swamid-2.0/filesender.sunet.se-shibboleth.xml
+++ b/swamid-2.0/filesender.sunet.se-shibboleth.xml
@@ -114,8 +114,8 @@ UY50dqiSgcqf0Heq
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://filesender.sunet.se/Shibboleth.sso/SLO/Artifact"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://filesender.sunet.se/Shibboleth.sso/SAML2/POST" index="1"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:SurName>Jonas Hagström</md:SurName>
     <md:EmailAddress>mailto:jonas@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/fs.test.ad.liu.se-adfs-services-trust.xml b/swamid-2.0/fs.test.ad.liu.se-adfs-services-trust.xml
index 47fe97c4..6d4d7b0c 100644
--- a/swamid-2.0/fs.test.ad.liu.se-adfs-services-trust.xml
+++ b/swamid-2.0/fs.test.ad.liu.se-adfs-services-trust.xml
@@ -79,15 +79,15 @@
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.test.ad.liu.se/adfs/ls/"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.test.ad.liu.se/adfs/ls/"/>
   </IDPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="sv">Linköpings universitet</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Linköpings universitet Test (ADFS)</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv">https://www.liu.se/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <GivenName>Saml</GivenName>
     <SurName>Admins</SurName>
     <EmailAddress>mailto:saml-admins@it.liu.se</EmailAddress>
     <TelephoneNumber>+46 13 282828</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/fs.vemendo.net-adfs-services-trust.xml b/swamid-2.0/fs.vemendo.net-adfs-services-trust.xml
index 344efb5b..e1656593 100644
--- a/swamid-2.0/fs.vemendo.net-adfs-services-trust.xml
+++ b/swamid-2.0/fs.vemendo.net-adfs-services-trust.xml
@@ -46,16 +46,16 @@
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fs.vemendo.net/adfs/ls/" index="1"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.vemendo.net/adfs/ls/" index="2"/>
   </SPSSODescriptor>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+  
+  
+<ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <GivenName>Jan</GivenName>
     <SurName>Aldoson</SurName>
     <EmailAddress>mailto:jan.aldoson@bygg.lu.se</EmailAddress>
     <TelephoneNumber>+46462220467</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <GivenName>Jan</GivenName>
     <SurName>Aldoson</SurName>
     <EmailAddress>mailto:jan.aldoson@bygg.lu.se</EmailAddress>
     <TelephoneNumber>+46462220467</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/funk.chs.chalmers.se-saml-www-module.php-saml-sp-metadata.php-Funk.xml b/swamid-2.0/funk.chs.chalmers.se-saml-www-module.php-saml-sp-metadata.php-Funk.xml
index 441b31f5..1279222c 100644
--- a/swamid-2.0/funk.chs.chalmers.se-saml-www-module.php-saml-sp-metadata.php-Funk.xml
+++ b/swamid-2.0/funk.chs.chalmers.se-saml-www-module.php-saml-sp-metadata.php-Funk.xml
@@ -32,9 +32,9 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://funk.chs.chalmers.se/saml/www/module.php/saml/sp/saml2-acs.php/Funk" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://funk.chs.chalmers.se/saml/www/module.php/saml/sp/saml1-acs.php/Funk/artifact" index="3"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>Robin</md:GivenName>
     <md:SurName>Jensen</md:SurName>
     <md:EmailAddress>mailto:robin@montania.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/gerrit.cs.lth.se-shibboleth.xml b/swamid-2.0/gerrit.cs.lth.se-shibboleth.xml
index b98cf051..f55d2275 100644
--- a/swamid-2.0/gerrit.cs.lth.se-shibboleth.xml
+++ b/swamid-2.0/gerrit.cs.lth.se-shibboleth.xml
@@ -90,9 +90,9 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gerrit.cs.lth.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gerrit.cs.lth.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>Peter</md:GivenName>
     <md:SurName>Moller</md:SurName>
     <md:EmailAddress>mailto:peter.moller@cs.lth.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/graduateland.com-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml b/swamid-2.0/graduateland.com-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml
index b3a102df..0e4adf7c 100644
--- a/swamid-2.0/graduateland.com-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml
+++ b/swamid-2.0/graduateland.com-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml
@@ -32,9 +32,9 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://graduateland.com/simplesaml/module.php/saml/sp/saml2-acs.php/gl_gateway" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="http://graduateland.com/simplesaml/module.php/saml/sp/saml1-acs.php/gl_gateway/artifact" index="3"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>Morten</md:GivenName>
     <md:SurName>Petersen</md:SurName>
     <md:EmailAddress>mailto:morten@graduateland.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/his.hr.evry.se-shibboleth.xml b/swamid-2.0/his.hr.evry.se-shibboleth.xml
index 9dd89503..615e633a 100644
--- a/swamid-2.0/his.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/his.hr.evry.se-shibboleth.xml
@@ -69,14 +69,14 @@ DTGN04FIC5s+8yFP1O/+RrQ8DQRmS/dfyc8iOXxm5vsWIVAnwD5nX5WrSp4=
       <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Evry HR Solutions AB</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Evry HR Solutions AB</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.evry.se/it-tjanster/applikationstjanster-och-losningar/personal-och-lonesystem/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
+  </md:Organization><md:ContactPerson contactType="support">
     <md:GivenName>Primula</md:GivenName>
     <md:SurName>Support</md:SurName>
     <md:EmailAddress>mailto:primulasupport@evry.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/humio.sunet.se-shibboleth.xml b/swamid-2.0/humio.sunet.se-shibboleth.xml
index ef8213b5..e169a028 100644
--- a/swamid-2.0/humio.sunet.se-shibboleth.xml
+++ b/swamid-2.0/humio.sunet.se-shibboleth.xml
@@ -89,14 +89,14 @@ MJcrninQKsm/XcSCCWQWEg==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://humio.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://humio.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Swedish University Network</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">SUNET</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.sunet.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
+  </md:Organization><md:ContactPerson contactType="administrative">
     <md:GivenName>Fredrik</md:GivenName>
     <md:SurName>Pettai</md:SurName>
     <md:EmailAddress>mailto:pettai@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp-test.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/idp-test.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index a6a71d59..d1a8429d 100644
--- a/swamid-2.0/idp-test.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/idp-test.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -34,9 +34,9 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://idp-test.nordu.net/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://idp-test.nordu.net/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="4"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>SUNET</md:GivenName>
     <md:SurName>NOC</md:SurName>
     <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp-test.suni.se-adfs-services-trust.xml b/swamid-2.0/idp-test.suni.se-adfs-services-trust.xml
index ae46bff3..07b8ba4a 100644
--- a/swamid-2.0/idp-test.suni.se-adfs-services-trust.xml
+++ b/swamid-2.0/idp-test.suni.se-adfs-services-trust.xml
@@ -65,14 +65,14 @@
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.suni.se/adfs/ls/"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.suni.se/adfs/ls/"/>
   </IDPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="sv">Södertörns högskola</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Södertörns högskola - test</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv">http://www.sh.se/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <GivenName>Tomas</GivenName>
     <SurName>Legat</SurName>
     <EmailAddress>mailto:tomas.legat@sh.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp-v2.suni.se-adfs-services-trust.xml b/swamid-2.0/idp-v2.suni.se-adfs-services-trust.xml
index 7ce46e8d..ca488031 100644
--- a/swamid-2.0/idp-v2.suni.se-adfs-services-trust.xml
+++ b/swamid-2.0/idp-v2.suni.se-adfs-services-trust.xml
@@ -42,18 +42,18 @@
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-v2.suni.se/adfs/ls/"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-v2.suni.se/adfs/ls/"/>
   </IDPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="sv">Södertörns högskola</OrganizationName>
     <OrganizationName xml:lang="en">Södertörn University</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Södertörns högskola</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Södertörn University</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv">http://www.sh.se</OrganizationURL>
     <OrganizationURL xml:lang="en">http://www.sh.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <GivenName>Tomas</GivenName>
     <SurName>Legat</SurName>
     <EmailAddress>mailto:server@sh.se</EmailAddress>
     <TelephoneNumber>+46(0)8-6084000</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp.esh.se-idp-shibboleth.xml b/swamid-2.0/idp.esh.se-idp-shibboleth.xml
index 15de65f5..8885cb67 100644
--- a/swamid-2.0/idp.esh.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.esh.se-idp-shibboleth.xml
@@ -87,15 +87,15 @@ geGI3bNTbXj3Fgu9lanUQE7DbWETQEnrqI2QH+8tr4vVnhG7jaET+qP/ya+XXPJ1
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
   </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="sv">Ersta Sköndal Högskola</OrganizationName>
     <OrganizationName xml:lang="en">Ersta Sköndal University College</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Ersta Sköndal Högskola</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Ersta Sköndal University College</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv">http://www.esh.se/</OrganizationURL>
     <OrganizationURL xml:lang="en">http://www.esh.se/in-english/ersta-skondal-hogskola---english.html</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <EmailAddress>mailto:klas.eriksson@esh.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp.hb.se-idp-shibboleth.xml b/swamid-2.0/idp.hb.se-idp-shibboleth.xml
index adcf238f..dd6d4427 100644
--- a/swamid-2.0/idp.hb.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.hb.se-idp-shibboleth.xml
@@ -215,28 +215,28 @@ hdayeb3tw8qRMHjEVgFSXDHRlA==
     </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hb.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
   </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="en">HB</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Högskolan i Borås</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">University of Borås</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.hb.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>University of Borås</Company>
     <SurName>Campus and IT services</SurName>
     <EmailAddress>mailto:campusservice@hb.se</EmailAddress>
     <TelephoneNumber>+46 33 435 4690</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>University of Borås</Company>
     <SurName>Campus and IT services</SurName>
     <EmailAddress>mailto:campusservice@hb.se</EmailAddress>
     <TelephoneNumber>+46 33 435 4690</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <Company>University of Borås</Company>
     <SurName>Campus and IT services</SurName>
     <EmailAddress>mailto:campusservice@hb.se</EmailAddress>
     <TelephoneNumber>+46 33 435 4690</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp.hh.se-idp-shibboleth.xml b/swamid-2.0/idp.hh.se-idp-shibboleth.xml
index 9fe8e11e..7052601a 100644
--- a/swamid-2.0/idp.hh.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.hh.se-idp-shibboleth.xml
@@ -190,28 +190,28 @@ YpNyRSuI6t4ZdyVTy4B2kXQtVfo=
     </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
   </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="en">HH</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Högskolan i Halmstad</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Halmstad University</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.hh.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>Halmstad University</Company>
     <SurName>Magnus Morén</SurName>
     <EmailAddress>mailto:magnus.moren@hh.se</EmailAddress>
     <TelephoneNumber>+46 35 167383</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>Halmstad University</Company>
     <SurName>Magnus Morén</SurName>
     <EmailAddress>mailto:magnus.moren@hh.se</EmailAddress>
     <TelephoneNumber>+46 35 167383</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <Company>Halmstad University</Company>
     <SurName>Helpdesk Högskloan i Halmstad</SurName>
     <EmailAddress>mailto:helpdesk@hh.se</EmailAddress>
     <TelephoneNumber>+35 167800</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp.hj.se-idp-shibboleth.xml b/swamid-2.0/idp.hj.se-idp-shibboleth.xml
index c23f8db3..cf276344 100644
--- a/swamid-2.0/idp.hj.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.hj.se-idp-shibboleth.xml
@@ -208,28 +208,28 @@ I91KnWp+FpSd3F3W0MlM1+MiKQ==
     <!-- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hj.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/> -->
     <!-- If you uncomment the above you should add urn:oasis:names:tc:SAML:2.0:protocol to the protocolSupportEnumeration above -->
   </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="en">HJ</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Högskolan i Jönköping</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Jönköping University</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.ju.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>Jönköping University</Company>
     <SurName>Joakim Danielsson</SurName>
     <EmailAddress>mailto:swamid@ju.se</EmailAddress>
     <TelephoneNumber>+46 36 101116</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>Jönköping University</Company>
     <SurName>Stefan Kindh</SurName>
     <EmailAddress>mailto:swamid@ju.se</EmailAddress>
     <TelephoneNumber>+46 36 101170</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <Company>Jönköping University</Company>
     <SurName>IT-Helpdesk</SurName>
     <EmailAddress>mailto:swamid@ju.se</EmailAddress>
     <TelephoneNumber>+46 36 101112</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp.it.su.se-idp-shibboleth.xml b/swamid-2.0/idp.it.su.se-idp-shibboleth.xml
index 3b2d53e7..82b1d521 100644
--- a/swamid-2.0/idp.it.su.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.it.su.se-idp-shibboleth.xml
@@ -63,32 +63,32 @@ VK8ZglMA+M28yzdAONQ4W2FWoTbAfcBnW8NQSFzZdQ==</ds:X509Certificate>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.it.su.se/idp/profile/SAML2/POST/SSO"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.it.su.se/idp/profile/SAML2/Redirect/SSO"/>
   </IDPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+  
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="en">SU</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Stockholms universitet</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Stockholm University</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.su.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>Stockholm University</Company>
     <SurName>Helpdesk</SurName>
     <EmailAddress>mailto:helpdesk@su.se</EmailAddress>
     <TelephoneNumber>+46 8 16 1999</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>Stockholm University</Company>
     <SurName>Helpdesk</SurName>
     <EmailAddress>mailto:helpdesk@su.se</EmailAddress>
     <TelephoneNumber>+46 8 16 1999</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <Company>Stockholm University</Company>
     <SurName>Helpdesk</SurName>
     <EmailAddress>mailto:helpdesk@su.se</EmailAddress>
     <TelephoneNumber>+46 8 16 1999</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+  </ContactPerson><ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
     <GivenName>Incident Response Team</GivenName>
     <EmailAddress>mailto:irt@su.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp.kb.se-idp-shibboleth.xml b/swamid-2.0/idp.kb.se-idp-shibboleth.xml
index d1d30224..d1a37aaa 100644
--- a/swamid-2.0/idp.kb.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.kb.se-idp-shibboleth.xml
@@ -195,28 +195,28 @@ hJ2GrICmdWsVIb88lmoEw8Hn/ew=
     </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kb.se/idp/profile/SAML1/SOAP/AttributeQuery"/>
   </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="en">KB</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Kungliga biblioteket</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">National Library of Sweden</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.kb.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>National Library of Sweden</Company>
     <SurName>Mattias Olsson</SurName>
     <EmailAddress>mailto:mattias.olsson@kb.se</EmailAddress>
     <TelephoneNumber>+46700073534</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>National Library of Sweden</Company>
     <SurName>Mattias Olsson</SurName>
     <EmailAddress>mailto:swamid@kb.se</EmailAddress>
     <TelephoneNumber>+46700073534</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <Company>National Library of Sweden</Company>
     <SurName>swamid@kb.se</SurName>
     <EmailAddress>mailto:swamid@kb.se</EmailAddress>
     <TelephoneNumber>+46700073555</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp.kva.se-idp-shibboleth.xml b/swamid-2.0/idp.kva.se-idp-shibboleth.xml
index a4131584..1a2025fc 100644
--- a/swamid-2.0/idp.kva.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.kva.se-idp-shibboleth.xml
@@ -95,25 +95,25 @@ y8hIAGqbY/OdUQkJXj68rm5qr6pGjBEq
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
   </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="en">KVA</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Kungliga Vetenskapsakademien</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">The Royal Swedish Academy of Sciences</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.kva.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>The Royal Swedish Academy of Sciences</Company>
     <EmailAddress>mailto:peter.jacobsson@kva.se</EmailAddress>
     <TelephoneNumber>+46 70 6739792</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>The Royal Swedish Academy of Sciences</Company>
     <EmailAddress>mailto:peter.jacobsson@kva.se</EmailAddress>
     <TelephoneNumber>+46 70 6739792</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <Company>The Royal Swedish Academy of Sciences</Company>
     <EmailAddress>mailto:peter.jacobsson@kva.se</EmailAddress>
     <TelephoneNumber>+46 70 6739792</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp.mdh.se-idp-shibboleth.xml b/swamid-2.0/idp.mdh.se-idp-shibboleth.xml
index b2888b55..90795b47 100644
--- a/swamid-2.0/idp.mdh.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.mdh.se-idp-shibboleth.xml
@@ -196,28 +196,28 @@ gJxaftdRQe7zWKOr0S7Lpm02pTSgD9bTPx1RVDuoyIYO0GGn+CF9ADzfOWR4dtJ9
     </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mdh.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
   </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="en">MDH</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Mälardalens Högskola</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Mälardalen University</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.mdh.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>Mälardalen University</Company>
     <SurName>Peter Falck</SurName>
     <EmailAddress>mailto:peter.falck@mdh.se</EmailAddress>
     <TelephoneNumber>+46 21 101499</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>Mälardalen University</Company>
     <SurName>MDH Drift</SurName>
     <EmailAddress>mailto:drift.ita@mdh.se</EmailAddress>
     <TelephoneNumber>+46 21 101499</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <Company>Mälardalen University</Company>
     <SurName>Helpdesk MDH</SurName>
     <EmailAddress>mailto:helpdesk@mdh.se</EmailAddress>
     <TelephoneNumber>+46 16 101550</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp.qa.lnu.se-idp-shibboleth.xml b/swamid-2.0/idp.qa.lnu.se-idp-shibboleth.xml
index bfc371e8..e2d62496 100644
--- a/swamid-2.0/idp.qa.lnu.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.qa.lnu.se-idp-shibboleth.xml
@@ -199,14 +199,14 @@
     </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.qa.lnu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
   </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="en">LNU</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Linnéuniversitetet QA</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Linnaeus University QA</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.lnu.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>Linnæus University</Company>
     <EmailAddress>mailto:it.idp@lnu.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp.ths.se-idp-shibboleth.xml b/swamid-2.0/idp.ths.se-idp-shibboleth.xml
index 651ae55f..38bebcb2 100644
--- a/swamid-2.0/idp.ths.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.ths.se-idp-shibboleth.xml
@@ -182,20 +182,20 @@ xAdB19mh1plahNrAaEfu6Ldetyz9iulY
     </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ths.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
   </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="en">THS</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Enskilda Högskolan Stockholm</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">University College Stockholm</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.ths.se/english</OrganizationURL>
     <OrganizationURL xml:lang="sv">http://www.ths.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <GivenName>Owe</GivenName>
     <SurName>Kennerberg</SurName>
     <EmailAddress>mailto:owe.kennerberg@ths.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <GivenName>Support</GivenName>
     <EmailAddress>mailto:support@ehs.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp.umu.se-saml2-idp-metadata.php.xml b/swamid-2.0/idp.umu.se-saml2-idp-metadata.php.xml
index a4ddfd9d..e7c9b256 100644
--- a/swamid-2.0/idp.umu.se-saml2-idp-metadata.php.xml
+++ b/swamid-2.0/idp.umu.se-saml2-idp-metadata.php.xml
@@ -56,30 +56,30 @@
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.umu.se/saml2/idp/SSOService.php"/>
   </md:IDPSSODescriptor>
-  <md:Organization>
+  
+  
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="sv">UmU</md:OrganizationName>
     <md:OrganizationName xml:lang="en">UmU</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Umeå universitet - OLD</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Umeå University - OLD</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">http://www.umu.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.umu.se/english</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
+  </md:Organization><md:ContactPerson contactType="administrative">
     <md:Company>Umeå University</md:Company>
     <md:SurName>ITS datordrift</md:SurName>
     <md:EmailAddress>mailto:datordrift@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:Company>Umeå University</md:Company>
     <md:SurName>ITS datordrift</md:SurName>
     <md:EmailAddress>mailto:datordrift@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
+  </md:ContactPerson><md:ContactPerson contactType="support">
     <md:Company>Umeå University</md:Company>
     <md:SurName>Servicedesk Umeå universitet</md:SurName>
     <md:EmailAddress>mailto:support@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp2.bth.se-idp-shibboleth.xml b/swamid-2.0/idp2.bth.se-idp-shibboleth.xml
index 319224c5..41a97f76 100644
--- a/swamid-2.0/idp2.bth.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp2.bth.se-idp-shibboleth.xml
@@ -200,32 +200,32 @@ KWto/xyUQbv82gswLTMa9y869J9X9IcMEYjVxg==
     </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.bth.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
   </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+  
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="en">BTH</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Blekinge Tekniska Högskola</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Blekinge Institute of Technology</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.bth.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>Blekinge Institute of Technology</Company>
     <SurName>IT Helpdesk</SurName>
     <EmailAddress>mailto:ithelpdesk@bth.se</EmailAddress>
     <TelephoneNumber>+46 455 38 51 00</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>Blekinge Institute of Technology</Company>
     <SurName>IT Helpdesk</SurName>
     <EmailAddress>mailto:ithelpdesk@bth.se</EmailAddress>
     <TelephoneNumber>+46 455 38 51 00</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <Company>Blekinge Institute of Technology</Company>
     <SurName>IT Helpdesk</SurName>
     <EmailAddress>mailto:ithelpdesk@bth.se</EmailAddress>
     <TelephoneNumber>+46 455 381500</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+  </ContactPerson><ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
     <GivenName>Security Response Team</GivenName>
     <EmailAddress>mailto:abuse@bth.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp2.kkh.se-idp-shibboleth.xml b/swamid-2.0/idp2.kkh.se-idp-shibboleth.xml
index c5e1d4f1..0e870fbe 100644
--- a/swamid-2.0/idp2.kkh.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp2.kkh.se-idp-shibboleth.xml
@@ -203,28 +203,28 @@ R/BU8rcOeQ5KU1e3ooJqSzIKBhWce80g4TaX1u1rYibKqkSUwgp1Jh2MSnKN0B8c
     <!-- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.kkh.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/> -->
     <!-- If you uncomment the above you should add urn:oasis:names:tc:SAML:2.0:protocol to the protocolSupportEnumeration above -->
   </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="en">KKH</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Kungl. Konsthögskolan</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Royal Institute of Art</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.kkh.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>Kungl. Konsthögskolan</Company>
     <SurName>Fredrik Reuterswärd</SurName>
     <EmailAddress>mailto:fredrik.reutersward@kkh.se</EmailAddress>
     <TelephoneNumber>+4686144064</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>Kungl. Konsthögskolan</Company>
     <SurName>Fredrik Reuterswärd</SurName>
     <EmailAddress>mailto:fredrik.reutersward@kkh.se</EmailAddress>
     <TelephoneNumber>+4686144064</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <Company>Kungl. Konsthögskolan</Company>
     <SurName>Fredrik Reuterswärd</SurName>
     <EmailAddress>mailto:fredrik.reutersward@kkh.se</EmailAddress>
     <TelephoneNumber>+4686144064</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp3.it.gu.se-idp-shibboleth.xml b/swamid-2.0/idp3.it.gu.se-idp-shibboleth.xml
index 446282b3..85a3449e 100644
--- a/swamid-2.0/idp3.it.gu.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp3.it.gu.se-idp-shibboleth.xml
@@ -194,30 +194,30 @@ mbmfzT51FSO1LI3Xw2lAtTgYi5oMWqxMao2yJl8MZKP4OY3Y
     </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.it.gu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
   </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+  
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="en">GU</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Göteborgs Universitet</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">University of Gothenburg</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.gu.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>University of Gothenburg</Company>
     <SurName>Lena Ström</SurName>
     <EmailAddress>mailto:lena.strom@gu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>University of Gothenburg</Company>
     <SurName>Tobias Galéus</SurName>
     <EmailAddress>mailto:tobias.galeus@gu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <Company>University of Gothenburg</Company>
     <SurName>GU-Support</SurName>
     <EmailAddress>mailto:support@gu.se</EmailAddress>
     <TelephoneNumber>+46317862020</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+  </ContactPerson><ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
     <GivenName>IRT GU</GivenName>
     <EmailAddress>mailto:irt@gu.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp3.sics.se-idp-shibboleth.xml b/swamid-2.0/idp3.sics.se-idp-shibboleth.xml
index 51e6fb41..092207e1 100644
--- a/swamid-2.0/idp3.sics.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp3.sics.se-idp-shibboleth.xml
@@ -188,15 +188,15 @@ RSPI3dYXTAE9qA5awk/PGw+gfj7d8mqBUfuSj+KU4A==
     </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.sics.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
   </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="en">SICS</OrganizationName>
     <OrganizationDisplayName xml:lang="en">SICS</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="sv">SICS</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">https://www.sics.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>SICS</Company>
     <SurName>CRIT</SurName>
     <EmailAddress>mailto:crit@sics.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idpaas.swamid.se-sp.xml b/swamid-2.0/idpaas.swamid.se-sp.xml
index e15c587d..2aac49dc 100644
--- a/swamid-2.0/idpaas.swamid.se-sp.xml
+++ b/swamid-2.0/idpaas.swamid.se-sp.xml
@@ -58,17 +58,17 @@ Pn4CLMAvvHqQ
     </KeyDescriptor>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpaas.swamid.se/Saml2SP/acs/post" index="1"/>
   </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="en">SUNET</OrganizationName>
     <OrganizationDisplayName xml:lang="en">Swedish University Network (SUNET)</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.sunet.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <GivenName>Technical</GivenName>
     <EmailAddress>mailto:noc@sunet.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <GivenName>Support</GivenName>
     <EmailAddress>mailto:noc@sunet.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/inslaget.kau.se-simplesaml-module.php-saml-sp-metadata.php-inslaget-sp.xml b/swamid-2.0/inslaget.kau.se-simplesaml-module.php-saml-sp-metadata.php-inslaget-sp.xml
index 1d33aa6a..8a2c8ec4 100644
--- a/swamid-2.0/inslaget.kau.se-simplesaml-module.php-saml-sp-metadata.php-inslaget-sp.xml
+++ b/swamid-2.0/inslaget.kau.se-simplesaml-module.php-saml-sp-metadata.php-inslaget-sp.xml
@@ -42,16 +42,16 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://inslaget.kau.se/simplesaml/module.php/saml/sp/saml2-acs.php/inslaget-sp" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://inslaget.kau.se/simplesaml/module.php/saml/sp/saml1-acs.php/inslaget-sp/artifact" index="3"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
+  
+  
+  
+<md:ContactPerson contactType="administrative">
     <md:SurName>Kommunikationsavdelningen</md:SurName>
     <md:EmailAddress>mailto:info@kau.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
+  </md:ContactPerson><md:ContactPerson contactType="support">
     <md:SurName>IT-avdelningen</md:SurName>
     <md:EmailAddress>mailto:2525@kau.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:SurName>IT-avdelningen</md:SurName>
     <md:EmailAddress>mailto:webbteknik@kau.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/internt.geol.lu.se-shibboleth.xml b/swamid-2.0/internt.geol.lu.se-shibboleth.xml
index 94f79541..9f6017ea 100644
--- a/swamid-2.0/internt.geol.lu.se-shibboleth.xml
+++ b/swamid-2.0/internt.geol.lu.se-shibboleth.xml
@@ -82,9 +82,9 @@ pyBfqZRW+lFWZ6b06Bj4Mg==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://internt.geol.lu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://internt.geol.lu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>Gert</md:GivenName>
     <md:SurName>Pettersson</md:SurName>
     <md:EmailAddress>mailto:gert.pettersson@geol.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/isoffan.sprakochfolkminnen.se.xml b/swamid-2.0/isoffan.sprakochfolkminnen.se.xml
index 7a6c07ad..dc1e4fec 100644
--- a/swamid-2.0/isoffan.sprakochfolkminnen.se.xml
+++ b/swamid-2.0/isoffan.sprakochfolkminnen.se.xml
@@ -58,13 +58,13 @@ DMnPXE0Z/FnZTDRBzUKknOSwHZ7qmWZOQOGYWV49tE+Ho+/SK0x62h/Pviehr4iuSEguDl1teP8=</ds
     <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://isoffan.sprakochfolkminnen.se/saml/SAMLAssertionConsumer" index="0" isDefault="true"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Intranät</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Intranät</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://isoffan.sprakochfolkminnen.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:Company>Intranät</md:Company>
     <md:EmailAddress>mailto:linn.kierkegaard@sprakochfolkminnen.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/its-pd0384.ad.umu.se-4444-shibboleth.xml b/swamid-2.0/its-pd0384.ad.umu.se-4444-shibboleth.xml
index 6afec710..6d490963 100644
--- a/swamid-2.0/its-pd0384.ad.umu.se-4444-shibboleth.xml
+++ b/swamid-2.0/its-pd0384.ad.umu.se-4444-shibboleth.xml
@@ -85,15 +85,15 @@ R8goZylfLlaYH0RQyMuClSC5BJlBB7yL58kraKY=
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://its-pd0384.ad.umu.se:4444/Shibboleth.sso/SLO/Artifact"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://its-pd0384.ad.umu.se:4444/Shibboleth.sso/SAML2/POST" index="1"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Umeå universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Umeå University</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.umu.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:GivenName>Erik</md:GivenName>
     <md:SurName>Jonsson</md:SurName>
     <md:EmailAddress>mailto:erik.jonsson@umu.se</md:EmailAddress>
     <md:TelephoneNumber>+46907869295</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/jira-stage.its.umu.se-shibboleth.xml b/swamid-2.0/jira-stage.its.umu.se-shibboleth.xml
index 93a6679c..e36d6c59 100644
--- a/swamid-2.0/jira-stage.its.umu.se-shibboleth.xml
+++ b/swamid-2.0/jira-stage.its.umu.se-shibboleth.xml
@@ -97,8 +97,8 @@ LUM1EdYsX8qUyvMYoftcOdiik08=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jira-stage.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jira-stage.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:SurName>Risto Järvi</md:SurName>
     <md:EmailAddress>mailto:risto.jarvi@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/jira-test.its.uu.se-shibboleth.sso.xml b/swamid-2.0/jira-test.its.uu.se-shibboleth.sso.xml
index a6c7880d..b4b60c08 100644
--- a/swamid-2.0/jira-test.its.uu.se-shibboleth.sso.xml
+++ b/swamid-2.0/jira-test.its.uu.se-shibboleth.sso.xml
@@ -97,25 +97,25 @@ uWha1n71XCbqdNegjx3kBJM4v/b9q4DZuao/X/VfqngFwJIrvJgj4tinlbQqrkg=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jira-test.its.uu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jira-test.its.uu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="sv">Uppsala universitet</OrganizationName>
     <OrganizationName xml:lang="en">Uppsala University</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Uppsala universitet</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Uppsala University</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv">http://www.uu.se/</OrganizationURL>
     <OrganizationURL xml:lang="en">http://www.uu.se/en/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>Uppsala universitet</Company>
     <EmailAddress>mailto:drift@uadm.uu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>Uppsala universitet</Company>
     <EmailAddress>mailto:drift@uadm.uu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <Company>Uppsala universitet</Company>
     <EmailAddress>mailto:servicedesk@uu.se</EmailAddress>
     <TelephoneNumber>+46184714400</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/jira.its.uu.se-Shibboleth.sso.xml b/swamid-2.0/jira.its.uu.se-Shibboleth.sso.xml
index 5804fb20..dc765891 100644
--- a/swamid-2.0/jira.its.uu.se-Shibboleth.sso.xml
+++ b/swamid-2.0/jira.its.uu.se-Shibboleth.sso.xml
@@ -97,25 +97,25 @@ U5AETOMMoTnJdA9/jkaK7+TbmcoHo0DgN2OdtAnZfHwbpvwxCNaGys4nfx+4ghrd
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://jira.its.uu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://jira.its.uu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="sv">Uppsala universitet</OrganizationName>
     <OrganizationName xml:lang="en">Uppsala University</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Uppsala universitet</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Uppsala University</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv">http://www.uu.se/</OrganizationURL>
     <OrganizationURL xml:lang="en">http://www.uu.se/en/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>Uppsala universitet</Company>
     <EmailAddress>mailto:drift@uadm.uu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>Uppsala universitet</Company>
     <EmailAddress>mailto:drift@uadm.uu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <Company>Uppsala universitet</Company>
     <EmailAddress>mailto:servicedesk@uu.se</EmailAddress>
     <TelephoneNumber>+46184714400</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/kauplay.kau.se.xml b/swamid-2.0/kauplay.kau.se.xml
index e784d4ef..9c6248c7 100644
--- a/swamid-2.0/kauplay.kau.se.xml
+++ b/swamid-2.0/kauplay.kau.se.xml
@@ -38,14 +38,14 @@
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kauplay.kau.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">KauPlay</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">KauPlay</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://kauplay.kau.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:GivenName>NORDUnet</md:GivenName>
     <md:SurName>SAML Admin</md:SurName>
     <md:EmailAddress>mailto:saml@media.nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/keystone-beta.cloud.ipnett.se-shibboleth.xml b/swamid-2.0/keystone-beta.cloud.ipnett.se-shibboleth.xml
index da366ce7..3ee4d642 100644
--- a/swamid-2.0/keystone-beta.cloud.ipnett.se-shibboleth.xml
+++ b/swamid-2.0/keystone-beta.cloud.ipnett.se-shibboleth.xml
@@ -85,13 +85,13 @@
       <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">SUNET</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">SUNET Cloud Services</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:SurName>Technical Support (SafeSpring)</md:SurName>
     <md:EmailAddress>mailto:iaas@cloud.ipnett.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/konto.test.uu.se-shibboleth.xml b/swamid-2.0/konto.test.uu.se-shibboleth.xml
index 6184fd6e..f22eec4d 100644
--- a/swamid-2.0/konto.test.uu.se-shibboleth.xml
+++ b/swamid-2.0/konto.test.uu.se-shibboleth.xml
@@ -52,17 +52,17 @@ Lf3VcAZi+NsypUL4nVwgn6iHbsaXGfTZPispp6rXJ48r/XnBFQ==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://konto.test.uu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://konto.test.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
     <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
+  </md:Organization><md:ContactPerson contactType="support">
     <md:Company>Uppsala universitet</md:Company>
     <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
     <md:TelephoneNumber>+46184714400</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-36.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-36.ladok.umu.se-gui-sp.xml
index ac7865cd..7a2b1ec1 100644
--- a/swamid-2.0/ladok3-36.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-36.ladok.umu.se-gui-sp.xml
@@ -101,22 +101,22 @@ FRj/+46KgK5AsL+n3sTjKALRGR65Z0/foxp+qyEOEloBEJ0R2V1Sznei+ZN423j5
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-36.ladok.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-36.ladok.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
+  
+  
+  
+<md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
+  </md:ContactPerson><md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Ladok-supporten</md:SurName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-jenkins-stage.ladok.umu.se-securityrealm-finishlogin.xml b/swamid-2.0/ladok3-jenkins-stage.ladok.umu.se-securityrealm-finishlogin.xml
index bdf07d51..2eed1268 100644
--- a/swamid-2.0/ladok3-jenkins-stage.ladok.umu.se-securityrealm-finishlogin.xml
+++ b/swamid-2.0/ladok3-jenkins-stage.ladok.umu.se-securityrealm-finishlogin.xml
@@ -79,19 +79,19 @@ t2vhP/rDBjzJrjTkE48i2g7fjcplgpQP5ajXX70wRMxyMXhtGayy</ds:X509Certificate>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ladok3-jenkins-stage.ladok.umu.se/securityRealm/finishLogin" index="0"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
+  
+  
+  
+<md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Anders Sigfridsson</md:SurName>
     <md:EmailAddress>mailto:anders.sigfridsson@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Anders Sigfridsson</md:SurName>
     <md:EmailAddress>mailto:anders.sigfridsson@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
+  </md:ContactPerson><md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Anders Sigfridsson</md:SurName>
     <md:EmailAddress>mailto:anders.sigfridsson@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3.its.umu.se-shibboleth.xml b/swamid-2.0/ladok3.its.umu.se-shibboleth.xml
index 6a86ffd2..942e0ecc 100644
--- a/swamid-2.0/ladok3.its.umu.se-shibboleth.xml
+++ b/swamid-2.0/ladok3.its.umu.se-shibboleth.xml
@@ -97,19 +97,19 @@ vqX2O1UUS1leSB8AnvrsfuoKlZQQKgsrokXQTEo=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
+  
+  
+  
+<md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
     <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
     <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
+  </md:ContactPerson><md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
     <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/lartorget.sll.se-luvit-shibboleth.xml b/swamid-2.0/lartorget.sll.se-luvit-shibboleth.xml
index fb988871..50383956 100644
--- a/swamid-2.0/lartorget.sll.se-luvit-shibboleth.xml
+++ b/swamid-2.0/lartorget.sll.se-luvit-shibboleth.xml
@@ -119,7 +119,7 @@ lmNgza+oGPGkyvuOaiCHWwyRsT9UmlVUOgZK1z5rZVSSSJiR7tRdYrE=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lartorget.sll.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lartorget.sll.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="support">
+  
+<md:ContactPerson contactType="support">
     <md:EmailAddress>mailto:lartorget.hsf@sll.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/led-jenkins.its.umu.se-securityrealm-finishlogin.xml b/swamid-2.0/led-jenkins.its.umu.se-securityrealm-finishlogin.xml
index a1aea64f..0fca1915 100644
--- a/swamid-2.0/led-jenkins.its.umu.se-securityrealm-finishlogin.xml
+++ b/swamid-2.0/led-jenkins.its.umu.se-securityrealm-finishlogin.xml
@@ -82,19 +82,19 @@ UHBO2OxgB6kTfTRUobl+uVQ3HZbL8RSvI25ox/Gab43L9VxQvacM55Lc</ds:X509Certificate>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://led-jenkins.its.umu.se/securityRealm/finishLogin" index="0"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
+  
+  
+  
+<md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
     <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
     <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
+  </md:ContactPerson><md:ContactPerson contactType="support">
     <md:Company>ITS, Umea universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
     <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/local.cloudmore.com-shibboleth.xml b/swamid-2.0/local.cloudmore.com-shibboleth.xml
index 73f1762d..61fb944d 100644
--- a/swamid-2.0/local.cloudmore.com-shibboleth.xml
+++ b/swamid-2.0/local.cloudmore.com-shibboleth.xml
@@ -93,12 +93,12 @@ f49DvQ516YA=
       <md:RequestedAttribute FriendlyName="eppn" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Cloudmore AB</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Cloudmore</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.cloudmore.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:EmailAddress>mailto:support@cloudmore.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/login.it.liu.se-idp-shibboleth.xml b/swamid-2.0/login.it.liu.se-idp-shibboleth.xml
index 7fe2a4ce..eddd34c7 100644
--- a/swamid-2.0/login.it.liu.se-idp-shibboleth.xml
+++ b/swamid-2.0/login.it.liu.se-idp-shibboleth.xml
@@ -212,33 +212,33 @@ RZPA+Q2niYC920FIv6uscwfFJR4PEFBA83wLSZ39FDm79HM3TNQ9KFtgLY8=
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.it.liu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
     <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.it.liu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
   </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+  
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="sv">LiU</OrganizationName>
     <OrganizationName xml:lang="en">LiU</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Linköpings Universitet - old</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Linköping University - old</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv">http://liu.se</OrganizationURL>
     <OrganizationURL xml:lang="en">http://liu.se/en</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>Linköping University</Company>
     <SurName>LiU-IT SAML admins</SurName>
     <EmailAddress>mailto:saml-admins@it.liu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>Linköping University</Company>
     <SurName>LiU-IT SAML admins</SurName>
     <EmailAddress>mailto:saml-admins@it.liu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <Company>Linköping University</Company>
     <SurName>LiU-IT Helpdesk</SurName>
     <EmailAddress>mailto:helpdesk@liu.se</EmailAddress>
     <TelephoneNumber>+46 13 282828</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
     <GivenName>LiU Incident Response Team</GivenName>
     <EmailAddress>mailto:abuse@liu.se</EmailAddress>
     <TelephoneNumber>+46 13 281744</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/login.mynetworkglobal.com-simplesaml-module.php-saml-sp-metadata.php-mynetwork-sp.xml b/swamid-2.0/login.mynetworkglobal.com-simplesaml-module.php-saml-sp-metadata.php-mynetwork-sp.xml
index 9615686a..1ba3da98 100644
--- a/swamid-2.0/login.mynetworkglobal.com-simplesaml-module.php-saml-sp-metadata.php-mynetwork-sp.xml
+++ b/swamid-2.0/login.mynetworkglobal.com-simplesaml-module.php-saml-sp-metadata.php-mynetwork-sp.xml
@@ -43,9 +43,9 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.mynetworkglobal.com/simplesaml/module.php/saml/sp/saml2-acs.php/mynetwork-sp" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.mynetworkglobal.com/simplesaml/module.php/saml/sp/saml1-acs.php/mynetwork-sp/artifact" index="3"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>Per</md:GivenName>
     <md:SurName>Newberg</md:SurName>
     <md:EmailAddress>mailto:support@varbi.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/login.test.it.liu.se-idp-shibboleth.xml b/swamid-2.0/login.test.it.liu.se-idp-shibboleth.xml
index 85bc8a62..54ee22c7 100644
--- a/swamid-2.0/login.test.it.liu.se-idp-shibboleth.xml
+++ b/swamid-2.0/login.test.it.liu.se-idp-shibboleth.xml
@@ -208,27 +208,27 @@ YuL6+TdT8Df+TZZZsCcCqEXauHzNFYBVP9iu3ZCLRbtIimTeYtKA1DwIcKewBZBv
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.test.it.liu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
     <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.test.it.liu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
   </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="sv">LiU</OrganizationName>
     <OrganizationName xml:lang="en">LiU</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Linköpings Universitet (TEST)</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Linköping University (TEST)</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv">http://liu.se</OrganizationURL>
     <OrganizationURL xml:lang="en">http://liu.se/en</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>Linköping University</Company>
     <SurName>LiU-IT SAML admins</SurName>
     <EmailAddress>mailto:saml-admins@it.liu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>Linköping University</Company>
     <SurName>LiU-IT SAML admins</SurName>
     <EmailAddress>mailto:saml-admins@it.liu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <Company>Linköping University</Company>
     <SurName>LiU-IT SAML admins</SurName>
     <EmailAddress>mailto:saml-admins@it.liu.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/login2.temp1235.hhs.se-idp-shibboleth.xml b/swamid-2.0/login2.temp1235.hhs.se-idp-shibboleth.xml
index 48d2be56..9ea0d36f 100644
--- a/swamid-2.0/login2.temp1235.hhs.se-idp-shibboleth.xml
+++ b/swamid-2.0/login2.temp1235.hhs.se-idp-shibboleth.xml
@@ -187,7 +187,10 @@ ZVOgTNDyMvfjJy54qOW28X+xRFZ9JpVo1SCBY/VyM1qJsOvFesw18dJORMU444BX
     <!-- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login2.temp1235.hhs.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/> -->
     <!-- If you uncomment the above you should add urn:oasis:names:tc:SAML:2.0:protocol to the protocolSupportEnumeration above -->
   </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="en">
          Stockholm School of Economics
       </OrganizationName>
@@ -206,11 +209,8 @@ ZVOgTNDyMvfjJy54qOW28X+xRFZ9JpVo1SCBY/VyM1qJsOvFesw18dJORMU444BX
     <OrganizationURL xml:lang="sv">
          https://www.hhs.se/sv/
       </OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <EmailAddress>mailto:gregor.borgstrand@hhs.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <EmailAddress>mailto:itsupport@hhs.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/lu-se.zoom.us.xml b/swamid-2.0/lu-se.zoom.us.xml
index 8e1e314c..15babe27 100644
--- a/swamid-2.0/lu-se.zoom.us.xml
+++ b/swamid-2.0/lu-se.zoom.us.xml
@@ -175,9 +175,9 @@ qoBVRu5DVnqs1dZZiZdHqRt3Tt22k0sDdvtQWnVISyGVqqSzPxq8YrLDVTA380eaXiYDbxoO1SN+
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lu-se.zoom.us/saml/SSO" index="0" isDefault="true"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lu-se.zoom.us/saml/SSO" index="1"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
+  
+<md:ContactPerson contactType="administrative">
     <md:GivenName>Maria</md:GivenName>
     <md:SurName>Hedberg</md:SurName>
     <md:EmailAddress>mailto:maria.hedberg@ahu.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/lu.beta.instructure.com-saml2.xml b/swamid-2.0/lu.beta.instructure.com-saml2.xml
index b4ed40b5..412ea20e 100644
--- a/swamid-2.0/lu.beta.instructure.com-saml2.xml
+++ b/swamid-2.0/lu.beta.instructure.com-saml2.xml
@@ -156,15 +156,15 @@ SQJDMGy5cRRcanOu2OwE</dsig:X509Certificate>
       <md:RequestedAttribute Name="urn:oid:2.5.4.4" FriendlyName="sn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
+  
+  
+  
+<md:ContactPerson contactType="administrative">
     <md:SurName>Maria Hedberg</md:SurName>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:SurName>Eskil Swahn</md:SurName>
     <md:EmailAddress>mailto:eskil.swahn@ldc.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
+  </md:ContactPerson><md:ContactPerson contactType="support">
     <md:SurName>Helpdesk</md:SurName>
     <md:EmailAddress>mailto:servicedesk@lu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/ludwig.lub.lu.se-sp.xml b/swamid-2.0/ludwig.lub.lu.se-sp.xml
index 2da5a5f8..077d07ec 100644
--- a/swamid-2.0/ludwig.lub.lu.se-sp.xml
+++ b/swamid-2.0/ludwig.lub.lu.se-sp.xml
@@ -56,9 +56,9 @@ HlE3GhfD6xYLE1DVbCmqzrnz4epcjc/5w0zd67HEJ0FTBxGGQvsExlvaA37vCKUZ
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.ludwig.lub.lu.se/Shibboleth.sso/SAML/POST" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.ludwig.lub.lu.se/Shibboleth.sso/SAML/Artifact" index="4"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>Dave</md:GivenName>
     <md:SurName>Sherohman</md:SurName>
     <md:EmailAddress>mailto:Dave.Sherohman@ub.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/luvit.education.lu.se-shibboleth.xml b/swamid-2.0/luvit.education.lu.se-shibboleth.xml
index 4c389120..2d417f3e 100644
--- a/swamid-2.0/luvit.education.lu.se-shibboleth.xml
+++ b/swamid-2.0/luvit.education.lu.se-shibboleth.xml
@@ -87,14 +87,14 @@ OTMXxdAawBca6aO1CpUMAwipgLVKJyNkmxV7+aPSdkp/U466LROEWhraZg==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://luvit.education.lu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://luvit.education.lu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
+  
+  
+<md:ContactPerson contactType="administrative">
     <md:GivenName>Sidika</md:GivenName>
     <md:SurName>Basic</md:SurName>
     <md:EmailAddress>mailto:sidika.basic@ahu.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:GivenName>Peter</md:GivenName>
     <md:SurName>Nilsson</md:SurName>
     <md:EmailAddress>mailto:peter.nilsson@grade.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/mah.hr.evry.se-shibboleth.xml b/swamid-2.0/mah.hr.evry.se-shibboleth.xml
index ca9f44c0..526c5a57 100644
--- a/swamid-2.0/mah.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/mah.hr.evry.se-shibboleth.xml
@@ -69,14 +69,14 @@ DTGN04FIC5s+8yFP1O/+RrQ8DQRmS/dfyc8iOXxm5vsWIVAnwD5nX5WrSp4=
       <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Evry HR Solutions AB</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Evry HR Solutions AB</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.evry.se/it-tjanster/applikationstjanster-och-losningar/personal-och-lonesystem/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
+  </md:Organization><md:ContactPerson contactType="support">
     <md:GivenName>Primula</md:GivenName>
     <md:SurName>Support</md:SurName>
     <md:EmailAddress>mailto:primulasupport@evry.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/medlem.konstkaren.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/medlem.konstkaren.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
index 15d5c74a..daea9259 100644
--- a/swamid-2.0/medlem.konstkaren.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
+++ b/swamid-2.0/medlem.konstkaren.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
@@ -39,9 +39,9 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://medlem.konstkaren.se/saml/simplesamlwww/module.php/saml/sp/saml2-acs.php/AgeraMedlem" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://medlem.konstkaren.se/saml/simplesamlwww/module.php/saml/sp/saml1-acs.php/AgeraMedlem/artifact" index="3"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>Johan</md:GivenName>
     <md:SurName>Sölve</md:SurName>
     <md:EmailAddress>mailto:webb@montania.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/medlem.linnestudenterna.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/medlem.linnestudenterna.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
index 0b913af1..7ee697e7 100644
--- a/swamid-2.0/medlem.linnestudenterna.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
+++ b/swamid-2.0/medlem.linnestudenterna.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
@@ -41,9 +41,9 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://medlem.linnestudenterna.se/saml/simplesamlwww/module.php/saml/sp/saml1-acs.php/AgeraMedlem/artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://medlem.linnestudenterna.se/saml/simplesamlwww/module.php/saml/sp/saml2-acs.php/AgeraMedlem" index="4"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>Johan</md:GivenName>
     <md:SurName>Sölve</md:SurName>
     <md:EmailAddress>mailto:johan@montania.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/medlem.lintek.liu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/medlem.lintek.liu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
index f22289f7..7909d13d 100644
--- a/swamid-2.0/medlem.lintek.liu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
+++ b/swamid-2.0/medlem.lintek.liu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
@@ -40,9 +40,9 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://medlem.lintek.liu.se/saml/simplesamlwww/module.php/saml/sp/saml2-acs.php/AgeraMedlem" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://medlem.lintek.liu.se/saml/simplesamlwww/module.php/saml/sp/saml1-acs.php/AgeraMedlem/artifact" index="3"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>Johan</md:GivenName>
     <md:SurName>Sölve</md:SurName>
     <md:EmailAddress>mailto:webb@montania.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/medlem.saks.gu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/medlem.saks.gu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
index 65f089be..197d3c35 100644
--- a/swamid-2.0/medlem.saks.gu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
+++ b/swamid-2.0/medlem.saks.gu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
@@ -39,9 +39,9 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://medlem.saks.gu.se/saml/simplesamlwww/module.php/saml/sp/saml2-acs.php/AgeraMedlem" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://medlem.saks.gu.se/saml/simplesamlwww/module.php/saml/sp/saml1-acs.php/AgeraMedlem/artifact" index="3"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>Johan</md:GivenName>
     <md:SurName>Sölve</md:SurName>
     <md:EmailAddress>mailto:webb@montania.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/miunidp.miun.se-idp-shibboleth.xml b/swamid-2.0/miunidp.miun.se-idp-shibboleth.xml
index a0cc05f1..e6633dfd 100644
--- a/swamid-2.0/miunidp.miun.se-idp-shibboleth.xml
+++ b/swamid-2.0/miunidp.miun.se-idp-shibboleth.xml
@@ -197,28 +197,28 @@ B9F/wgJ22q78SOeLzik0JTCya18K9vjuod/q7n5tM1zDi/pDyT2Fy/s+pw==
     </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://miunidp.miun.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
   </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="en">MIUN</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Mittuniversitetet</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Mid Sweden University</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.miun.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>Mid Sweden University</Company>
     <SurName>SystemDrift, IT-avdelningen, Mittuniversitetet</SurName>
     <EmailAddress>mailto:swamidcontact@miun.se</EmailAddress>
     <TelephoneNumber>+46 10-142 80 00</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>Mid Sweden University</Company>
     <SurName>SystemDrift, IT-avdelningen, Mittuniversitetet</SurName>
     <EmailAddress>mailto:swamidcontact@miun.se</EmailAddress>
     <TelephoneNumber>+46 10-142 80 00</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <Company>Mid Sweden University</Company>
     <SurName>IT Helpdesk</SurName>
     <EmailAddress>mailto:helpdesk@miun.se</EmailAddress>
     <TelephoneNumber>+46 771 976130</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/mondo-test.su.se-shibboleth.sso.xml b/swamid-2.0/mondo-test.su.se-shibboleth.sso.xml
index da370f89..78a56b1a 100644
--- a/swamid-2.0/mondo-test.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/mondo-test.su.se-shibboleth.sso.xml
@@ -69,8 +69,8 @@ snJSQ/YlB4ldg4xiZo0aKDvUVZqlhkCcwEKNcNrwiXxMtkx0ekUmiHv5SA==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mondo-test.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mondo-test.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:SurName>IT-avdelningen</md:SurName>
     <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/moodlebeta.omv.lu.se-shibboleth.xml b/swamid-2.0/moodlebeta.omv.lu.se-shibboleth.xml
index a8c52272..029aeb0f 100644
--- a/swamid-2.0/moodlebeta.omv.lu.se-shibboleth.xml
+++ b/swamid-2.0/moodlebeta.omv.lu.se-shibboleth.xml
@@ -84,19 +84,19 @@ jzMxgqnyamTpp7hwx3jDcTUb+je1noS8/idhg2ftGINQzJmTufH/xF02Yz6qwDkw
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://moodlebeta.omv.lu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://moodlebeta.omv.lu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
+  
+  
+  
+<md:ContactPerson contactType="administrative">
     <md:GivenName>Niklas</md:GivenName>
     <md:SurName>Frost</md:SurName>
     <md:EmailAddress>mailto:niklas.frost@med.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:GivenName>Rikard</md:GivenName>
     <md:SurName>Johansson</md:SurName>
     <md:EmailAddress>mailto:rikard.johansson@med.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
+  </md:ContactPerson><md:ContactPerson contactType="support">
     <md:GivenName>Magnus</md:GivenName>
     <md:SurName>Hovde</md:SurName>
     <md:EmailAddress>mailto:magnus.hovde@med.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/mp.uu.se-Shibboleth.sso.xml b/swamid-2.0/mp.uu.se-Shibboleth.sso.xml
index d498c28a..d900eef9 100644
--- a/swamid-2.0/mp.uu.se-Shibboleth.sso.xml
+++ b/swamid-2.0/mp.uu.se-Shibboleth.sso.xml
@@ -65,16 +65,16 @@ Ohr8KLKt6tC/JZ059e8ENxrN7g==
       <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">UU</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.uu.se/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
+  </md:Organization><md:ContactPerson contactType="support">
     <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:EmailAddress>mailto:liferay-datordrift@its.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/mystery.cs.lth.se-shibboleth.xml b/swamid-2.0/mystery.cs.lth.se-shibboleth.xml
index 3a15d194..724de30e 100644
--- a/swamid-2.0/mystery.cs.lth.se-shibboleth.xml
+++ b/swamid-2.0/mystery.cs.lth.se-shibboleth.xml
@@ -98,24 +98,24 @@ dky/L3kUg/jrdGgTRg==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vm52.cs.lth.se/Shibboleth.sso/SAML/POST" index="11"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vm52.cs.lth.se/Shibboleth.sso/SAML/Artifact" index="12"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="sv">LU</md:OrganizationName>
     <md:OrganizationName xml:lang="en">LU</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">PLDetective</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">PLDetective</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">http://www.lu.se</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.lunduniversity.lu.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:GivenName>Christoph</md:GivenName>
     <md:SurName>Reichenbach</md:SurName>
     <md:EmailAddress>mailto:christoph.reichenbach@cs.lth.se</md:EmailAddress>
     <md:TelephoneNumber>+46 46 222 8037</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
+  </md:ContactPerson><md:ContactPerson contactType="support">
     <md:GivenName>Christoph</md:GivenName>
     <md:SurName>Reichenbach</md:SurName>
     <md:EmailAddress>mailto:christoph.reichenbach@cs.lth.se</md:EmailAddress>
     <md:TelephoneNumber>+46 46 222 8037</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/ni.sunet.se-saml2-metadata.xml b/swamid-2.0/ni.sunet.se-saml2-metadata.xml
index a2b161c5..9919cbf3 100644
--- a/swamid-2.0/ni.sunet.se-saml2-metadata.xml
+++ b/swamid-2.0/ni.sunet.se-saml2-metadata.xml
@@ -72,10 +72,10 @@ aRl22guR2G2MeQtvNn+JuYRmrJbW8xi5mXCQkps2TvQfiVLHAzCIpXUZANpnS582
       <md:RequestedAttribute Name="displayName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:Company>NORDUnet A/S</md:Company>
     <md:GivenName>Markus</md:GivenName>
     <md:SurName>Krogh</md:SurName>
     <md:EmailAddress>mailto:markus@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/nyainloggning.hv.se-shibboleth.xml b/swamid-2.0/nyainloggning.hv.se-shibboleth.xml
index f9fdf449..4e885c7e 100644
--- a/swamid-2.0/nyainloggning.hv.se-shibboleth.xml
+++ b/swamid-2.0/nyainloggning.hv.se-shibboleth.xml
@@ -124,8 +124,8 @@ oIyTUksBl/ojxagzCZBedDveO9N3U7nYZOqL/NbI+jcOmw==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nyainloggning.hv.se/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nyainloggning.hv.se/Shibboleth.sso/SAML2/POST" index="5"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:SurName>Christian Jiresjö</md:SurName>
     <md:EmailAddress>mailto:christian.jiresjo@hv.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/pingpong.hb.se-shibboleth.sso-metadata.xml b/swamid-2.0/pingpong.hb.se-shibboleth.sso-metadata.xml
index fe04351d..11c66167 100644
--- a/swamid-2.0/pingpong.hb.se-shibboleth.sso-metadata.xml
+++ b/swamid-2.0/pingpong.hb.se-shibboleth.sso-metadata.xml
@@ -46,25 +46,25 @@ tK5eKJ70Qsj0YizWe90n9K+VGOryORdurTNkxJNVHxSvPZRuFQ==
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pingpong.hb.se/Shibboleth.sso/SAML2/POST" index="1"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Borås University</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Högskolan i Borås</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Borås University</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Högskolan i Borås</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.hb.se/en/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.hb.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
+  </md:Organization><md:ContactPerson contactType="support">
     <md:EmailAddress>mailto:pingpong@hb.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:Company>Ping Pong AB</md:Company>
     <md:GivenName>Palle</md:GivenName>
     <md:SurName>Girgensohn</md:SurName>
     <md:EmailAddress>mailto:girgen@pingpong.se</md:EmailAddress>
     <md:TelephoneNumber>+46856628000</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="other">
+  </md:ContactPerson><md:ContactPerson contactType="other">
     <md:Company>Högskolan i Borås</md:Company>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/play.chalmers.se.xml b/swamid-2.0/play.chalmers.se.xml
index 04ea366e..8a70160d 100644
--- a/swamid-2.0/play.chalmers.se.xml
+++ b/swamid-2.0/play.chalmers.se.xml
@@ -38,13 +38,13 @@
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.chalmers.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Chalmers (PROD)</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Chalmers (PROD)</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://play.chalmers.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:SurName>Administrator</md:SurName>
     <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/play.fhs.se.xml b/swamid-2.0/play.fhs.se.xml
index 9417ec9f..ffb9f658 100644
--- a/swamid-2.0/play.fhs.se.xml
+++ b/swamid-2.0/play.fhs.se.xml
@@ -38,13 +38,13 @@
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.fhs.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Försvarshögskolan (PROD)</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Försvarshögskolan (PROD)</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://play.fhs.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:SurName>Administrator</md:SurName>
     <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/play.hhs.se.xml b/swamid-2.0/play.hhs.se.xml
index b304f917..26f750be 100644
--- a/swamid-2.0/play.hhs.se.xml
+++ b/swamid-2.0/play.hhs.se.xml
@@ -38,13 +38,13 @@
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.hhs.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Stockholm School of Economics Play service</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Stockholm School of Economics Play service</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://play.hhs.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:SurName>Administrator</md:SurName>
     <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/play.ki.se.xml b/swamid-2.0/play.ki.se.xml
index 635c6901..0f27e9fb 100644
--- a/swamid-2.0/play.ki.se.xml
+++ b/swamid-2.0/play.ki.se.xml
@@ -38,13 +38,13 @@
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.ki.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">KI play</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">KI play</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://play.ki.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:SurName>Administrator</md:SurName>
     <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/play.mah.se.xml b/swamid-2.0/play.mah.se.xml
index 13a66f5e..a4ae087e 100644
--- a/swamid-2.0/play.mah.se.xml
+++ b/swamid-2.0/play.mah.se.xml
@@ -38,13 +38,13 @@
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.mah.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">MAH (PROD)</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">MAH (PROD)</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://play.mah.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:SurName>Administrator</md:SurName>
     <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/play.miun.se.xml b/swamid-2.0/play.miun.se.xml
index 7106dcae..79558154 100644
--- a/swamid-2.0/play.miun.se.xml
+++ b/swamid-2.0/play.miun.se.xml
@@ -41,13 +41,13 @@
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.miun.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Mittuniversitetet (PROD)</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Mittuniversitetet (PROD)</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://play.miun.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:SurName>Administrator</md:SurName>
     <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/play.rkh.se.xml b/swamid-2.0/play.rkh.se.xml
index c9ca63b2..4fc41353 100644
--- a/swamid-2.0/play.rkh.se.xml
+++ b/swamid-2.0/play.rkh.se.xml
@@ -38,13 +38,13 @@
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.rkh.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Röda Korsets Högskola</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Röda Korsets Högskola</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://play.rkh.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:SurName>Administrator</md:SurName>
     <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/play.shh.se.xml b/swamid-2.0/play.shh.se.xml
index a13265cb..afe2a4b6 100644
--- a/swamid-2.0/play.shh.se.xml
+++ b/swamid-2.0/play.shh.se.xml
@@ -38,14 +38,14 @@
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.shh.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Sophiahemmet Högskola</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Sophiahemmet Högskola</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://play.shh.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:GivenName>NORDUnet</md:GivenName>
     <md:SurName>SAML Admin</md:SurName>
     <md:EmailAddress>mailto:saml@media.nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/portal.medicinskaforeningen.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/portal.medicinskaforeningen.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
index 15ee5251..5e56bdd0 100644
--- a/swamid-2.0/portal.medicinskaforeningen.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
+++ b/swamid-2.0/portal.medicinskaforeningen.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
@@ -49,9 +49,9 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://portal.medicinskaforeningen.se/saml/simplesamlwww/module.php/saml/sp/saml1-acs.php/AgeraMedlem/artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://portal.medicinskaforeningen.se/saml/simplesamlwww/module.php/saml/sp/saml2-acs.php/AgeraMedlem" index="4"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>Johan</md:GivenName>
     <md:SurName>Sölve</md:SurName>
     <md:EmailAddress>mailto:johan@montania.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/portalki.onricoh.se-shibboleth.xml b/swamid-2.0/portalki.onricoh.se-shibboleth.xml
index ef318f5c..8e827e7f 100644
--- a/swamid-2.0/portalki.onricoh.se-shibboleth.xml
+++ b/swamid-2.0/portalki.onricoh.se-shibboleth.xml
@@ -90,19 +90,19 @@ GX6rbVM3C9aRnjhlQqEgw3FxEoxqmBhzUA5M71jvOII=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://portalki.onricoh.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://portalki.onricoh.se/Shibboleth.sso/SAML2/ECP" index="4"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Ricoh Sweden AB</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Ricoh Sweden AB</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.ricoh.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
+  </md:Organization><md:ContactPerson contactType="support">
     <md:GivenName>Ricoh</md:GivenName>
     <md:SurName>Support</md:SurName>
     <md:EmailAddress>mailto:kundservice@ricoh.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:GivenName>Ricoh</md:GivenName>
     <md:SurName>Support</md:SurName>
     <md:EmailAddress>mailto:kundservice@ricoh.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/prestaging.cloudmore.com-shibboleth.xml b/swamid-2.0/prestaging.cloudmore.com-shibboleth.xml
index 529a3ee3..1c8694a8 100644
--- a/swamid-2.0/prestaging.cloudmore.com-shibboleth.xml
+++ b/swamid-2.0/prestaging.cloudmore.com-shibboleth.xml
@@ -94,12 +94,12 @@ KG+MY9n4aaqecV40ScxWptqZOJPVWBH4Yh1BocVylDM=
       <md:RequestedAttribute FriendlyName="eppn" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Cloudmore AB</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Cloudmore</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.cloudmore.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:EmailAddress>mailto:support@cloudmore.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/pubs.acs.org-shibboleth.xml b/swamid-2.0/pubs.acs.org-shibboleth.xml
index 993c6712..34567987 100644
--- a/swamid-2.0/pubs.acs.org-shibboleth.xml
+++ b/swamid-2.0/pubs.acs.org-shibboleth.xml
@@ -42,24 +42,24 @@ nvM3BvC0Ws92j354L9VJfg==
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pubs.acs.org/action/saml2post" index="2"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pubs.acs.org/action/saml2artifact" index="3"/>
   </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="en">American Chemical Society, Inc</OrganizationName>
     <OrganizationDisplayName xml:lang="en">ACS Publications</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.acs.org/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <GivenName>Kal</GivenName>
     <SurName>Hashmani</SurName>
     <EmailAddress>mailto:k_hashmani@acs.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <GivenName>Gabriel</GivenName>
     <SurName>Kiblin</SurName>
     <EmailAddress>mailto:g_kiblin@acs.org</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <GivenName>John</GivenName>
     <SurName>MacArthur</SurName>
     <EmailAddress>mailto:j_macarthur@acs.org</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/redcap.tst.ki.se-shibboleth.xml b/swamid-2.0/redcap.tst.ki.se-shibboleth.xml
index d7c68401..323e465e 100644
--- a/swamid-2.0/redcap.tst.ki.se-shibboleth.xml
+++ b/swamid-2.0/redcap.tst.ki.se-shibboleth.xml
@@ -86,9 +86,9 @@ Gve8ozn6yxplJyB0jvZae8kfE4LtXr4adWlYG2E=
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://redcap.tst.ki.se/Shibboleth.sso/SLO/Artifact"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://redcap.tst.ki.se/Shibboleth.sso/SAML2/POST" index="1"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
+  
+<md:ContactPerson contactType="administrative">
     <md:GivenName>Michal</md:GivenName>
     <md:SurName>Kment</md:SurName>
     <md:EmailAddress>mailto:michal.kment@ki.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/referens-idp.skolfederation.se-idp-shibboleth.xml b/swamid-2.0/referens-idp.skolfederation.se-idp-shibboleth.xml
index 089e3be0..ad188461 100644
--- a/swamid-2.0/referens-idp.skolfederation.se-idp-shibboleth.xml
+++ b/swamid-2.0/referens-idp.skolfederation.se-idp-shibboleth.xml
@@ -81,13 +81,13 @@ l27vPw5wc7vuymARYxUEaDSRqL1Tzk784JGsGeoAhGMMjJp+IiYC6rtRDOD43rsZ
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
   </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="en">ReferensIdP</OrganizationName>
     <OrganizationDisplayName xml:lang="en">Skolfederation.SE Referens-IDP</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://skolfederation.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>SUNET</Company>
     <EmailAddress>mailto:operations@skolfederation.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/s2s.ifmsa.se-saml2-proxy_saml2_backend.xml b/swamid-2.0/s2s.ifmsa.se-saml2-proxy_saml2_backend.xml
index 208d10a4..8c373d50 100644
--- a/swamid-2.0/s2s.ifmsa.se-saml2-proxy_saml2_backend.xml
+++ b/swamid-2.0/s2s.ifmsa.se-saml2-proxy_saml2_backend.xml
@@ -45,17 +45,17 @@ zJkE6G+EYWU=
     <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://s2s.ifmsa.se/Saml2/acs/post" index="1"/>
     <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://s2s.ifmsa.se/Saml2/acs/redirect" index="2"/>
   </ns0:SPSSODescriptor>
-  <ns0:Organization xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+  
+<ns0:Organization xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata">
     <ns0:OrganizationName xml:lang="en">IFMSA-Sweden</ns0:OrganizationName>
     <ns0:OrganizationDisplayName xml:lang="en">IFMSA-Sweden</ns0:OrganizationDisplayName>
     <ns0:OrganizationURL xml:lang="en">https://www.ifmsa.se</ns0:OrganizationURL>
-  </ns0:Organization>
-  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </ns0:Organization><ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <ns0:GivenName>Admin</ns0:GivenName>
     <ns0:EmailAddress>mailto:admin@ifmsa.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
-  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+  </ns0:ContactPerson><ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <ns0:GivenName>Admin</ns0:GivenName>
     <ns0:EmailAddress>mailto:admin@ifmsa.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
-</md:EntityDescriptor>
+  </ns0:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml b/swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml
index 8d5faa79..8f43929b 100644
--- a/swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml
+++ b/swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml
@@ -138,32 +138,32 @@ jmufPg==
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://saml-5.sys.kth.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saml-5.sys.kth.se/idp/profile/SAML2/Redirect/SSO"/>
   </md:IDPSSODescriptor>
-  <md:Organization>
+  
+  
+  
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">KTH</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Kungliga Tekniska högskolan (KTH)</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">KTH Royal Institute of Technology</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.kth.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
+  </md:Organization><md:ContactPerson contactType="administrative">
     <md:Company>KTH Royal Institute of Technology</md:Company>
     <md:SurName>UF/ITA Infra (Alexander Boström, Mikael Bengtsson)</md:SurName>
     <md:EmailAddress>mailto:ita-infra-saml-contact@kth.se</md:EmailAddress>
     <md:TelephoneNumber>+46 8 790 6000</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:Company>KTH Royal Institute of Technology</md:Company>
     <md:SurName>UF/ITA Infra (Alexander Boström, Mikael Bengtsson)</md:SurName>
     <md:EmailAddress>mailto:ita-infra-saml-contact@kth.se</md:EmailAddress>
     <md:TelephoneNumber>+46 8 790 6000</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
+  </md:ContactPerson><md:ContactPerson contactType="support">
     <md:Company>KTH Royal Institute of Technology</md:Company>
     <md:SurName>KTH IT-Support</md:SurName>
     <md:EmailAddress>mailto:it-support@kth.se</md:EmailAddress>
     <md:TelephoneNumber>+46 8 790 6600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+  </md:ContactPerson><md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
     <md:GivenName>Security Response Team</md:GivenName>
     <md:EmailAddress>mailto:abuse@kth.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/se.timeedit.net-hhs-staff.xml b/swamid-2.0/se.timeedit.net-hhs-staff.xml
index 6710a117..7e9505a8 100644
--- a/swamid-2.0/se.timeedit.net-hhs-staff.xml
+++ b/swamid-2.0/se.timeedit.net-hhs-staff.xml
@@ -41,9 +41,9 @@ YFMsQoFZQd+f5DZjuG5tfyWUpcNd+REWUddnOOM=</ds:X509Certificate>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" isDefault="false" index="0" Location="https://se.timeedit.net/web/hhs/db1/timeedit/ssoResponse/saml2_staff"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>TimeEdit</md:GivenName>
     <md:SurName>Support</md:SurName>
     <md:EmailAddress>mailto:support@evolvera.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/se.timeedit.net-hhs-stud.xml b/swamid-2.0/se.timeedit.net-hhs-stud.xml
index 2e517c96..dad698ef 100644
--- a/swamid-2.0/se.timeedit.net-hhs-stud.xml
+++ b/swamid-2.0/se.timeedit.net-hhs-stud.xml
@@ -41,9 +41,9 @@ YFMsQoFZQd+f5DZjuG5tfyWUpcNd+REWUddnOOM=</ds:X509Certificate>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" isDefault="false" index="0" Location="https://se.timeedit.net/web/hhs/db1/timeedit/ssoResponse/saml2_student"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>TimeEdit</md:GivenName>
     <md:SurName>Support</md:SurName>
     <md:EmailAddress>mailto:support@evolvera.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/se.timeedit.net-kth-student-sp.xml b/swamid-2.0/se.timeedit.net-kth-student-sp.xml
index 7831dd2c..adb0665f 100644
--- a/swamid-2.0/se.timeedit.net-kth-student-sp.xml
+++ b/swamid-2.0/se.timeedit.net-kth-student-sp.xml
@@ -41,9 +41,9 @@ YFMsQoFZQd+f5DZjuG5tfyWUpcNd+REWUddnOOM=</ds:X509Certificate>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" isDefault="false" index="0" Location="https://se.timeedit.net/web/kth/db1/timeedit/ssoResponse/saml2_stud"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>TimeEdit</md:GivenName>
     <md:SurName>Support</md:SurName>
     <md:EmailAddress>mailto:support@evolvera.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/se.timeedit.net-lapinamk-generic-sp.xml b/swamid-2.0/se.timeedit.net-lapinamk-generic-sp.xml
index b01952a0..87965012 100644
--- a/swamid-2.0/se.timeedit.net-lapinamk-generic-sp.xml
+++ b/swamid-2.0/se.timeedit.net-lapinamk-generic-sp.xml
@@ -56,9 +56,9 @@ GImnaeS4</ds:X509Certificate>
       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>TimeEdit</md:GivenName>
     <md:SurName>Support</md:SurName>
     <md:EmailAddress>mailto:support@evolvera.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/se.timeedit.net-lu-general-sp.xml b/swamid-2.0/se.timeedit.net-lu-general-sp.xml
index 913fd61f..ef683f29 100644
--- a/swamid-2.0/se.timeedit.net-lu-general-sp.xml
+++ b/swamid-2.0/se.timeedit.net-lu-general-sp.xml
@@ -47,14 +47,14 @@ YFMsQoFZQd+f5DZjuG5tfyWUpcNd+REWUddnOOM=</ds:X509Certificate>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" isDefault="false" index="0" Location="https://se.timeedit.net/web/lu/db1/timeedit/ssoResponse/lu_generic_saml2"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>TimeEdit</md:GivenName>
     <md:SurName>Support</md:SurName>
     <md:EmailAddress>mailto:support@evolvera.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
+  </md:ContactPerson><md:ContactPerson contactType="administrative">
     <md:GivenName>Rikard</md:GivenName>
     <md:SurName>Stymne</md:SurName>
     <md:EmailAddress>mailto:rikard.stymne@ht.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/se.timeedit.net-miun.xml b/swamid-2.0/se.timeedit.net-miun.xml
index 8606cf7a..8ce56f11 100644
--- a/swamid-2.0/se.timeedit.net-miun.xml
+++ b/swamid-2.0/se.timeedit.net-miun.xml
@@ -47,14 +47,14 @@ YFMsQoFZQd+f5DZjuG5tfyWUpcNd+REWUddnOOM=</ds:X509Certificate>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" isDefault="false" index="0" Location="https://se.timeedit.net/web/miun/db1/timeedit/ssoResponse/swamid_miun"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>TimeEdit</md:GivenName>
     <md:SurName>Support</md:SurName>
     <md:EmailAddress>mailto:support@evolvera.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
+  </md:ContactPerson><md:ContactPerson contactType="administrative">
     <md:GivenName>Ove</md:GivenName>
     <md:SurName>Olander</md:SurName>
     <md:EmailAddress>mailto:Ove.Olander@miun.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/se.timeedit.net-ssh-sp.xml b/swamid-2.0/se.timeedit.net-ssh-sp.xml
index b3ca92f8..599c1f6e 100644
--- a/swamid-2.0/se.timeedit.net-ssh-sp.xml
+++ b/swamid-2.0/se.timeedit.net-ssh-sp.xml
@@ -38,9 +38,9 @@ urn:oasis:names:tc:SAML:2.0:nameid-format:persistent
 </md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" isDefault="false" index="0" Location="https://se.timeedit.net/web/shh/db1/timeedit/ssoResponse/swamid_shh"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>TimeEdit</md:GivenName>
     <md:SurName>Support</md:SurName>
     <md:EmailAddress>mailto:support@evolvera.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_pers_saml2.xml b/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_pers_saml2.xml
index c2304c01..d621a568 100644
--- a/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_pers_saml2.xml
+++ b/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_pers_saml2.xml
@@ -46,9 +46,9 @@ GImnaeS4</ds:X509Certificate>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
     <md:AssertionConsumerService index="0" isDefault="false" Location="https://se.timeedit.net/web/lnu/db1/timeedit/ssoResponse/lnu_pers_saml2" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>TimeEdit</md:GivenName>
     <md:SurName>Support</md:SurName>
     <md:EmailAddress>mailto:support@evolvera.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_stud_saml2.xml b/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_stud_saml2.xml
index 6d9a127d..6db17ed0 100644
--- a/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_stud_saml2.xml
+++ b/swamid-2.0/se.timeedit.net-web-lnu-db1-timeedit-ssoMetadata-lnu_stud_saml2.xml
@@ -46,9 +46,9 @@ GImnaeS4</ds:X509Certificate>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
     <md:AssertionConsumerService index="0" isDefault="false" Location="https://se.timeedit.net/web/lnu/db1/timeedit/ssoResponse/lnu_stud_saml2" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>TimeEdit</md:GivenName>
     <md:SurName>Support</md:SurName>
     <md:EmailAddress>mailto:support@evolvera.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/secure.urkund.com-shibboleth.xml b/swamid-2.0/secure.urkund.com-shibboleth.xml
index 647e2429..eaacdc23 100644
--- a/swamid-2.0/secure.urkund.com-shibboleth.xml
+++ b/swamid-2.0/secure.urkund.com-shibboleth.xml
@@ -130,22 +130,22 @@ Qkn4OQ==
       <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Prio Infocenter AB</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Prio Infocenter AB</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">URKUND / Prio Infocenter AB</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">URKUND / Prio Infocenter AB</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.urkund.com/en/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.urkund.com/sv/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
+  </md:Organization><md:ContactPerson contactType="administrative">
     <md:GivenName>Peter</md:GivenName>
     <md:SurName>Witasp</md:SurName>
     <md:EmailAddress>mailto:peter.witasp@prioinfo.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:GivenName>Simon</md:GivenName>
     <md:SurName>Forsberg</md:SurName>
     <md:EmailAddress>mailto:simon.forsberg@urkund.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/sgw.africa-grid.org-shibboleth.xml b/swamid-2.0/sgw.africa-grid.org-shibboleth.xml
index e683c874..60c8f845 100644
--- a/swamid-2.0/sgw.africa-grid.org-shibboleth.xml
+++ b/swamid-2.0/sgw.africa-grid.org-shibboleth.xml
@@ -93,21 +93,21 @@ j/MCNlE=
       <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Consorzio COMETA</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">COMETA</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:GivenName>Marco</md:GivenName>
     <md:SurName>Fargetta</md:SurName>
     <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
     <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
+  </md:ContactPerson><md:ContactPerson contactType="administrative">
     <md:GivenName>Roberto</md:GivenName>
     <md:SurName>Barbera</md:SurName>
     <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
     <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/shib-1-r.referens.sys.kth.se-idp-shibboleth.xml b/swamid-2.0/shib-1-r.referens.sys.kth.se-idp-shibboleth.xml
index bd22d55c..ccb92b52 100644
--- a/swamid-2.0/shib-1-r.referens.sys.kth.se-idp-shibboleth.xml
+++ b/swamid-2.0/shib-1-r.referens.sys.kth.se-idp-shibboleth.xml
@@ -79,13 +79,13 @@ A7VlBNLOTweEKWEGoMAE8meALW+o3Q8ZC3GUFyi6zV3L92x6xwb0YyNnYpS/wf0U
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
   </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="en">KTH-REFERENS</OrganizationName>
     <OrganizationDisplayName xml:lang="en">Kungliga Tekniska högskolan (REFERENS)</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.kth.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>Royal Institute of Technology (KTH)</Company>
     <EmailAddress>mailto:itesc@kth.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/shib-idp-2.oru.se-idp-shibboleth.xml b/swamid-2.0/shib-idp-2.oru.se-idp-shibboleth.xml
index 990dc416..b125a74b 100644
--- a/swamid-2.0/shib-idp-2.oru.se-idp-shibboleth.xml
+++ b/swamid-2.0/shib-idp-2.oru.se-idp-shibboleth.xml
@@ -206,27 +206,27 @@ d3hB7quCN72lcAz/8iZU
     </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp-2.oru.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
   </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="en">ORU</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Örebro universitet</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Örebro University</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.oru.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>Örebro University</Company>
     <SurName>IT Avdelningen</SurName>
     <EmailAddress>mailto:itsupport@oru.se</EmailAddress>
     <TelephoneNumber>+46 19 303166</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>Örebro universitet</Company>
     <SurName>IT-support</SurName>
     <EmailAddress>mailto:itsupport@oru.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <Company>Örebro University</Company>
     <SurName>IT Avdelningen Örebro universitet</SurName>
     <EmailAddress>mailto:itsupport@oru.se</EmailAddress>
     <TelephoneNumber>+46 19 303166</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/shibboleth.msacademicverify.com-shibboleth-sp.xml b/swamid-2.0/shibboleth.msacademicverify.com-shibboleth-sp.xml
index 3da85af6..eea3733d 100644
--- a/swamid-2.0/shibboleth.msacademicverify.com-shibboleth-sp.xml
+++ b/swamid-2.0/shibboleth.msacademicverify.com-shibboleth-sp.xml
@@ -57,21 +57,21 @@
       <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
     </AttributeConsumingService>
   </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="en">Microsoft</OrganizationName>
     <OrganizationDisplayName xml:lang="en">Microsoft</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.microsoft.com/en/us/default.aspx</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <GivenName>AVE Support</GivenName>
     <EmailAddress>mailto:avesupp@microsoft.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <GivenName>Gaurav Kakodkar</GivenName>
     <EmailAddress>mailto:gauraka@microsoft.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <GivenName>AVE Support</GivenName>
     <EmailAddress>mailto:avesupp@microsoft.com</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml b/swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml
index 91a4d44f..367296ed 100644
--- a/swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml
+++ b/swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml
@@ -97,25 +97,25 @@ UIW4Y6GzlL7EfXr31lnv
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
   </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="en">Universitets- och hogskoleradet</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Universitets- och högskolerådet</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">The Swedish Council for Higher Education</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.uhr.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>The Swedish Council for Higher Education</Company>
     <SurName>Lennart Hellsten</SurName>
     <EmailAddress>mailto:lennart.hellsten@uhr.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>The Swedish Council for Higher Education</Company>
     <SurName>Lennart Hellsten</SurName>
     <EmailAddress>mailto:lennart.hellsten@uhr.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <Company>The Swedish Council for Higher Education</Company>
     <SurName>Lennart Hellsten</SurName>
     <EmailAddress>mailto:lennart.hellsten@uhr.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/smultron.catalogix.se-8090-sp.xml b/swamid-2.0/smultron.catalogix.se-8090-sp.xml
index af6b3290..3a7f9fec 100644
--- a/swamid-2.0/smultron.catalogix.se-8090-sp.xml
+++ b/swamid-2.0/smultron.catalogix.se-8090-sp.xml
@@ -31,13 +31,13 @@ zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN
     </ns0:KeyDescriptor>
     <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://smultron.catalogix.se:8090/" index="1"/>
   </ns0:SPSSODescriptor>
-  <ns0:Organization xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+<ns0:Organization xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata">
     <ns0:OrganizationName xml:lang="en">The GEMbus registry at Ladok</ns0:OrganizationName>
     <ns0:OrganizationDisplayName xml:lang="en">The GEMbus registry at Ladok</ns0:OrganizationDisplayName>
     <ns0:OrganizationURL xml:lang="en">http://smultron.catalogix.se:8090/gembus.html</ns0:OrganizationURL>
-  </ns0:Organization>
-  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </ns0:Organization><ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <ns0:GivenName>Roland</ns0:GivenName>
     <ns0:SurName>Hedberg</ns0:SurName>
-  </ns0:ContactPerson>
-</md:EntityDescriptor>
+  </ns0:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/sp.haikom.com-saml-kph-test.xml b/swamid-2.0/sp.haikom.com-saml-kph-test.xml
index 0cec8c63..137b1a5d 100644
--- a/swamid-2.0/sp.haikom.com-saml-kph-test.xml
+++ b/swamid-2.0/sp.haikom.com-saml-kph-test.xml
@@ -38,13 +38,13 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tryckportal.kph.se:8443/Kph/api/saml/sp/v1/sso/POST" index="1" isDefault="true"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tryckportal.kph.se:8443/Kph/api/saml/sp/v1/sso/Redirect" index="2" isDefault="false"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">HaiKom AB</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">HaiKom</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.haikom.com</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
+  </md:Organization><md:ContactPerson contactType="support">
     <md:Company>HaiKom</md:Company>
     <md:EmailAddress>mailto:support@haikom.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/sp.lhs.se-shibboleth.xml b/swamid-2.0/sp.lhs.se-shibboleth.xml
index 16876140..b63313fa 100644
--- a/swamid-2.0/sp.lhs.se-shibboleth.xml
+++ b/swamid-2.0/sp.lhs.se-shibboleth.xml
@@ -15,15 +15,15 @@
     </KeyDescriptor>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.lhs.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
   </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="en">LHS</OrganizationName>
     <OrganizationDisplayName xml:lang="en">Lärarhögskolan</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.lhs.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>LHS</Company>
     <GivenName>Patrik</GivenName>
     <SurName>Blomkvist</SurName>
     <EmailAddress>mailto:patrik.blomkvist@lhs.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/sse.instructure.com-saml2.xml b/swamid-2.0/sse.instructure.com-saml2.xml
index dfc90620..cf111287 100644
--- a/swamid-2.0/sse.instructure.com-saml2.xml
+++ b/swamid-2.0/sse.instructure.com-saml2.xml
@@ -80,20 +80,20 @@ BN+f6kyYZ9ztdvueX8SUp5T4s40=</dsig:X509Certificate>
       <md:RequestedAttribute Name="urn:oid:2.5.4.4" FriendlyName="sn" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+  
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>Gottfried</md:GivenName>
     <md:SurName>Gemzell</md:SurName>
     <md:EmailAddress>mailto:gottfried.gemzell@hhs.se</md:EmailAddress>
     <md:TelephoneNumber>+46 70 2578838</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
+  </md:ContactPerson><md:ContactPerson contactType="administrative">
     <md:GivenName>Anders</md:GivenName>
     <md:SurName>Richtnér</md:SurName>
     <md:EmailAddress>mailto:anders.richtner@hhs.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
+  </md:ContactPerson><md:ContactPerson contactType="support">
     <md:SurName>SSE Servicedesk</md:SurName>
     <md:EmailAddress>mailto:servicedesk@hhs.se</md:EmailAddress>
     <md:TelephoneNumber>+46 8 7369400</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/sso.skolverket.sonet.com.au-module.php-saml-sp-metadata.php-sp1.xml b/swamid-2.0/sso.skolverket.sonet.com.au-module.php-saml-sp-metadata.php-sp1.xml
new file mode 100644
index 00000000..1a77d598
--- /dev/null
+++ b/swamid-2.0/sso.skolverket.sonet.com.au-module.php-saml-sp-metadata.php-sp1.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://sso.skolverket.sonet.com.au/module.php/saml/sp/metadata.php/sp1">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Skolverket Assessment Master</mdui:DisplayName>
+        <mdui:Description xml:lang="en">SSO Proxy service for skolverket assessment master</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://sonet.com.au/products/assessment-master/</mdui:InformationURL>
+        <mdui:Keywords xml:lang="en">assessment+master+uat</mdui:Keywords>
+        <mdui:Logo width="377" height="387">https://am.uat.skolverket.sonet.com.au/images/amlogo.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFjTCCA3WgAwIBAgIJANVxJlfdCHlXMA0GCSqGSIb3DQEBCwUAMF0xCzAJBgNVBAYTAkFVMREwDwYDVQQIDAhWaWN0b3JpYTESMBAGA1UEBwwJTWVsYm91cm5lMQswCQYDVQQKDAJSTTEaMBgGA1UECwwRQXNzZXNzbWVudCBNYXN0ZXIwHhcNMTkwOTE2MTM1ODI3WhcNMjQxMDIxMTM1ODI3WjBdMQswCQYDVQQGEwJBVTERMA8GA1UECAwIVmljdG9yaWExEjAQBgNVBAcMCU1lbGJvdXJuZTELMAkGA1UECgwCUk0xGjAYBgNVBAsMEUFzc2Vzc21lbnQgTWFzdGVyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEArxpj0bELquvXbAXaM0gsgwHbhjWHdOqQUuSh3febaMWs2M4rW4uEkcJwIWVdengZWPSL11ALsYYRtS7JOxiDbHvcDnfL8VK+V0pFn3jB3/BMrv5+zhF6ZLRafcLfHSW7D8xWdwR2VsdcIsjVZ0Ah+5xZPBpcEl8cK3ZdIXxKcafYWPYUEcVnHF9VJBsjzGOrB5KGvlVwLm9WUNXR41buc2TLJCh0l0eCe782TBqvobQsmc2nuj2A8XaQ9QTboxJWKH/qY6l6JPScqV9s+GL0B2enrYiLAA1Ry0GaDM/THvNKpsu623JrZ9cWa/JVZsBXAZcCHDh9+aPzU60M26DyjQwqiS7gIu82LMvgmcuydOdNhhQhyrP5z+aH6zgJRVHvO3mpvWxuGIiW04u72B60AmtTLaqhwjFTXp435pFre6Qy/2O7wdhoofn5tu4lEM9QNomR9U1+WqNR/zgVfoGPjIJr2XX0Cdghe+kQ9kIuBsHH6AnuMBsTKzhgDg7SEn6uXKe1X0wH8z/ffBOZSpndPEu8+V0yagm7gslzJtxSf46QN02c8dFUK5n1Y59yhyK3dWclI80R3Bu+g9UqvoiNBI+hnL01v+kZ/I4jJIJLHkNRN6u1oEuLvFpjAj9kbon/Opec2nQFYfcfNHtG+ivYOeBQKUtbPaGIEVTZ/NN/np0CAwEAAaNQME4wHQYDVR0OBBYEFAJAw/CY0k9AfqIoWBJ0ex+OzZKPMB8GA1UdIwQYMBaAFAJAw/CY0k9AfqIoWBJ0ex+OzZKPMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBADxVjrKrTilwnr2HE/UTzo8Hk496Y307L20JjWpFlvLorYTydKvPKfy66xsy3DM4PGm4O6M1JbKFM0s/2ewH8Dqi4ZwFVa62tIRJTtVHxxnGexr9c2vExIt9N57qQ9pwzQBBPzuUC8JqVO1xCqlQKKvoY3ZTodtUz8fqnJOjToAL/rGVHQ8l+m2pl5rC4hbTmh8L4/4SlMWutgw8zH7xvfgizk75BiiMUjJMzAA16kDmzI9fB9dCEzzMNtv3wiq6eeoc7R/BbTVOU0Nvf4ki4/RmKkwYscnkdd9hLhLgqBU8JcWRmtdMNHdIOHmrI+d7GTVEHH9ORbCqZC3RwZYvZoy19qPs6Ar9lOMoo+PYDS2Pdtr32nZ2PwmZgBZ0BT2xoXZxbBqJoQv3xI83Cn4wwvquTdfpR/jMCyzXrHy34oy9DZ3w9BMJj9GMPBudMEgld2PqiFH8IDEt+DlHnViShEqtLpgmEnhAs6V7ON5bNThTVXrMaB+GodnW4Uuu3UBNOFPCufnhAsqZjBiSRXBEuK0t4+fBFoOgDIXNeUFujr2jjAhIpUi/YqvvDJ8H8lqXYentO/B3qoqD5gT2rljvEedR6rRFmL1WGUhNlmdPeA1NRXMv5opG5BnRBgpWAr2i9vYw+9taUHjh+hCOvm8fsnMkKpX5/YXHBALKb0NAy6n1</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFjTCCA3WgAwIBAgIJANVxJlfdCHlXMA0GCSqGSIb3DQEBCwUAMF0xCzAJBgNVBAYTAkFVMREwDwYDVQQIDAhWaWN0b3JpYTESMBAGA1UEBwwJTWVsYm91cm5lMQswCQYDVQQKDAJSTTEaMBgGA1UECwwRQXNzZXNzbWVudCBNYXN0ZXIwHhcNMTkwOTE2MTM1ODI3WhcNMjQxMDIxMTM1ODI3WjBdMQswCQYDVQQGEwJBVTERMA8GA1UECAwIVmljdG9yaWExEjAQBgNVBAcMCU1lbGJvdXJuZTELMAkGA1UECgwCUk0xGjAYBgNVBAsMEUFzc2Vzc21lbnQgTWFzdGVyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEArxpj0bELquvXbAXaM0gsgwHbhjWHdOqQUuSh3febaMWs2M4rW4uEkcJwIWVdengZWPSL11ALsYYRtS7JOxiDbHvcDnfL8VK+V0pFn3jB3/BMrv5+zhF6ZLRafcLfHSW7D8xWdwR2VsdcIsjVZ0Ah+5xZPBpcEl8cK3ZdIXxKcafYWPYUEcVnHF9VJBsjzGOrB5KGvlVwLm9WUNXR41buc2TLJCh0l0eCe782TBqvobQsmc2nuj2A8XaQ9QTboxJWKH/qY6l6JPScqV9s+GL0B2enrYiLAA1Ry0GaDM/THvNKpsu623JrZ9cWa/JVZsBXAZcCHDh9+aPzU60M26DyjQwqiS7gIu82LMvgmcuydOdNhhQhyrP5z+aH6zgJRVHvO3mpvWxuGIiW04u72B60AmtTLaqhwjFTXp435pFre6Qy/2O7wdhoofn5tu4lEM9QNomR9U1+WqNR/zgVfoGPjIJr2XX0Cdghe+kQ9kIuBsHH6AnuMBsTKzhgDg7SEn6uXKe1X0wH8z/ffBOZSpndPEu8+V0yagm7gslzJtxSf46QN02c8dFUK5n1Y59yhyK3dWclI80R3Bu+g9UqvoiNBI+hnL01v+kZ/I4jJIJLHkNRN6u1oEuLvFpjAj9kbon/Opec2nQFYfcfNHtG+ivYOeBQKUtbPaGIEVTZ/NN/np0CAwEAAaNQME4wHQYDVR0OBBYEFAJAw/CY0k9AfqIoWBJ0ex+OzZKPMB8GA1UdIwQYMBaAFAJAw/CY0k9AfqIoWBJ0ex+OzZKPMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBADxVjrKrTilwnr2HE/UTzo8Hk496Y307L20JjWpFlvLorYTydKvPKfy66xsy3DM4PGm4O6M1JbKFM0s/2ewH8Dqi4ZwFVa62tIRJTtVHxxnGexr9c2vExIt9N57qQ9pwzQBBPzuUC8JqVO1xCqlQKKvoY3ZTodtUz8fqnJOjToAL/rGVHQ8l+m2pl5rC4hbTmh8L4/4SlMWutgw8zH7xvfgizk75BiiMUjJMzAA16kDmzI9fB9dCEzzMNtv3wiq6eeoc7R/BbTVOU0Nvf4ki4/RmKkwYscnkdd9hLhLgqBU8JcWRmtdMNHdIOHmrI+d7GTVEHH9ORbCqZC3RwZYvZoy19qPs6Ar9lOMoo+PYDS2Pdtr32nZ2PwmZgBZ0BT2xoXZxbBqJoQv3xI83Cn4wwvquTdfpR/jMCyzXrHy34oy9DZ3w9BMJj9GMPBudMEgld2PqiFH8IDEt+DlHnViShEqtLpgmEnhAs6V7ON5bNThTVXrMaB+GodnW4Uuu3UBNOFPCufnhAsqZjBiSRXBEuK0t4+fBFoOgDIXNeUFujr2jjAhIpUi/YqvvDJ8H8lqXYentO/B3qoqD5gT2rljvEedR6rRFmL1WGUhNlmdPeA1NRXMv5opG5BnRBgpWAr2i9vYw+9taUHjh+hCOvm8fsnMkKpX5/YXHBALKb0NAy6n1</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.skolverket.sonet.com.au/module.php/saml/sp/saml2-logout.php/sp1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.skolverket.sonet.com.au/module.php/saml/sp/saml2-logout.php/sp1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.skolverket.sonet.com.au/module.php/saml/sp/saml2-acs.php/sp1" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sso.skolverket.sonet.com.au/module.php/saml/sp/saml1-acs.php/sp1" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.skolverket.sonet.com.au/module.php/saml/sp/saml2-acs.php/sp1" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso.skolverket.sonet.com.au/module.php/saml/sp/saml1-acs.php/sp1/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Skolverket Assessment Master</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">SSO Proxy service for skolverket assessment master</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" FriendlyName="eduPersonPrincipalName"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  
+  
+  
+<md:Organization>
+    <md:OrganizationName xml:lang="en">SoNET</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">SoNET Systems</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">https://sonet.com.au</md:OrganizationURL>
+  </md:Organization><md:ContactPerson contactType="support">
+    <md:Company>SoNET Systems</md:Company>
+    <md:GivenName>Software</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:software@sonet.com.au</md:EmailAddress>
+    <md:TelephoneNumber>+61(0)385337700</md:TelephoneNumber>
+  </md:ContactPerson><md:ContactPerson contactType="technical">
+    <md:GivenName>Support</md:GivenName>
+    <md:EmailAddress>mailto:software@sonet.com.au</md:EmailAddress>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/sso.uat.skolverket.sonet.com.au-module.php-saml-sp-metadata.php-sp1.xml b/swamid-2.0/sso.uat.skolverket.sonet.com.au-module.php-saml-sp-metadata.php-sp1.xml
index 8029c8cc..e322a865 100644
--- a/swamid-2.0/sso.uat.skolverket.sonet.com.au-module.php-saml-sp-metadata.php-sp1.xml
+++ b/swamid-2.0/sso.uat.skolverket.sonet.com.au-module.php-saml-sp-metadata.php-sp1.xml
@@ -28,16 +28,16 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sso.uat.skolverket.sonet.com.au/module.php/saml/sp/saml2-acs.php/sp1" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sso.uat.skolverket.sonet.com.au/module.php/saml/sp/saml1-acs.php/sp1/artifact" index="3"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">SoNET</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">SoNET Systems</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://sonet.com.au</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
+  </md:Organization><md:ContactPerson contactType="support">
     <md:Company>SoNET Systems</md:Company>
     <md:GivenName>Software</md:GivenName>
     <md:SurName>Support</md:SurName>
     <md:EmailAddress>mailto:software@sonet.com.au</md:EmailAddress>
     <md:TelephoneNumber>+61(0)385337700</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/stats.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/stats.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 781997a6..1f099be7 100644
--- a/swamid-2.0/stats.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/stats.inacademia.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -36,18 +36,18 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stats.inacademia.org/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://stats.inacademia.org/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">InAcademia</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">InAcademia</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://inacademia.org</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
+  </md:Organization><md:ContactPerson contactType="support">
     <md:GivenName>InAcademia</md:GivenName>
     <md:SurName>Support</md:SurName>
     <md:EmailAddress>mailto:support@inacademia.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:GivenName>InAcademia Technical Support</md:GivenName>
     <md:EmailAddress>mailto:tech@inacademia.org</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/stipendieansokan-test.uaf.uu.se-stipendium.xml b/swamid-2.0/stipendieansokan-test.uaf.uu.se-stipendium.xml
index fc35001b..7ea95a65 100644
--- a/swamid-2.0/stipendieansokan-test.uaf.uu.se-stipendium.xml
+++ b/swamid-2.0/stipendieansokan-test.uaf.uu.se-stipendium.xml
@@ -56,14 +56,14 @@ lQDSN7w4inBTDBIKvjWfVg==</ds:X509Certificate>
     <md:AssertionConsumerService xmlns:hoksso="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="http://stipendieansokan-test.uaf.uu.se:80/stipendium/saml/HoKSSO/alias/defaultAlias" hoksso:ProtocolBinding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" index="3"/>
     <md:AssertionConsumerService xmlns:hoksso="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="http://stipendieansokan-test.uaf.uu.se:80/stipendium/saml/HoKSSO/alias/defaultAlias" hoksso:ProtocolBinding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="4"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">UU</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Uppsala universitet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.uu.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:Company>Uppsala universitet</md:Company>
     <md:SurName>Stipendiehantering</md:SurName>
     <md:EmailAddress>mailto:stipendie-datordrift@its.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/stipendier-test.its.uu.se-stipendium.xml b/swamid-2.0/stipendier-test.its.uu.se-stipendium.xml
index 62914050..d7b2b861 100644
--- a/swamid-2.0/stipendier-test.its.uu.se-stipendium.xml
+++ b/swamid-2.0/stipendier-test.its.uu.se-stipendium.xml
@@ -50,9 +50,9 @@ l+6u+L3FBjFOWmy9EQZdyA==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stipendier-test.its.uu.se:443/stipendium/saml/SSO/alias/defaultAlias" index="0" isDefault="true"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stipendier-test.its.uu.se:443/stipendium/saml/SSO/alias/defaultAlias" index="1"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
+  
+<md:ContactPerson contactType="administrative">
     <md:GivenName>Tommy</md:GivenName>
     <md:SurName>Stenvi</md:SurName>
     <md:EmailAddress>mailto:tommy.stenvi@uadm.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/stipendier.uu.se-stipendium.xml b/swamid-2.0/stipendier.uu.se-stipendium.xml
index a3e5730e..da8150b2 100644
--- a/swamid-2.0/stipendier.uu.se-stipendium.xml
+++ b/swamid-2.0/stipendier.uu.se-stipendium.xml
@@ -65,9 +65,9 @@
     <md:AssertionConsumerService xmlns:hoksso="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://stipendier.uu.se:443/stipendium/saml/HoKSSO/alias/defaultAlias" hoksso:ProtocolBinding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" index="3"/>
     <md:AssertionConsumerService xmlns:hoksso="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://stipendier.uu.se:443/stipendium/saml/HoKSSO/alias/defaultAlias" hoksso:ProtocolBinding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="4"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
+  
+<md:ContactPerson contactType="administrative">
     <md:GivenName>Tommy</md:GivenName>
     <md:SurName>Stenvi</md:SurName>
     <md:EmailAddress>mailto:tommy.stenvi@uadm.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/student.mit.ladok.se-student-sp.xml b/swamid-2.0/student.mit.ladok.se-student-sp.xml
index f854469b..1909edde 100644
--- a/swamid-2.0/student.mit.ladok.se-student-sp.xml
+++ b/swamid-2.0/student.mit.ladok.se-student-sp.xml
@@ -77,22 +77,22 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.mit.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.mit.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
+  
+  
+  
+<md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
+  </md:ContactPerson><md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Ladok-supporten</md:SurName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/student.utbildning.ladok.se-student-sp.xml b/swamid-2.0/student.utbildning.ladok.se-student-sp.xml
index 71faab8f..ee0f5aeb 100644
--- a/swamid-2.0/student.utbildning.ladok.se-student-sp.xml
+++ b/swamid-2.0/student.utbildning.ladok.se-student-sp.xml
@@ -93,22 +93,22 @@ lrb0HK3oComFcluTV4lDDQRDF0HoHsT1E9iPnMA3/lIzKxHggMYWDoue9eOj3yrW
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://student.utbildning.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.utbildning.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
+  
+  
+  
+<md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
+  </md:ContactPerson><md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Ladok-supporten</md:SurName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/studeranuutv.its.umu.se-shibboleth.xml b/swamid-2.0/studeranuutv.its.umu.se-shibboleth.xml
index 39ef73da..8cec7971 100644
--- a/swamid-2.0/studeranuutv.its.umu.se-shibboleth.xml
+++ b/swamid-2.0/studeranuutv.its.umu.se-shibboleth.xml
@@ -91,9 +91,9 @@ A1TJgm8iwv1lbM4AwMqlLlWC+wOm7YV2zUrEYYcoPp8=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://studeranuutv.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://studeranuutv.its.umu.se/Shibboleth.sso/SAML2/POST" index="7"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>Erik</md:GivenName>
     <md:SurName>Jonsson</md:SurName>
     <md:EmailAddress>mailto:erik.jonsson@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/swamid.vr.se-idp-shibboleth.xml b/swamid-2.0/swamid.vr.se-idp-shibboleth.xml
index a43a014b..3317fc6f 100644
--- a/swamid-2.0/swamid.vr.se-idp-shibboleth.xml
+++ b/swamid-2.0/swamid.vr.se-idp-shibboleth.xml
@@ -188,14 +188,14 @@ ZyJActptXxuKpK7kDw3emzp+cUmalkrHkBxi4WzUB44=
     </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://swamid.vr.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
   </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="en">VR</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Vetenskapsrådet</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">The Swedish Research Council</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.vr.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <SurName>Robert Chrudina</SurName>
     <EmailAddress>mailto:robert.chrudina@tieto.com</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/tcs-escience.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/tcs-escience.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
index 84d1cbe3..a747864c 100644
--- a/swamid-2.0/tcs-escience.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/tcs-escience.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
@@ -33,9 +33,9 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tcs-escience.sunet.se/simplesamlphp/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://tcs-escience.sunet.se/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>UvT</md:GivenName>
     <md:SurName>LIS Unix</md:SurName>
     <md:EmailAddress>mailto:lis-unix@uvt.nl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/tentaadmin.test.umu.se-shibboleth.xml b/swamid-2.0/tentaadmin.test.umu.se-shibboleth.xml
index 32962989..43ac4774 100644
--- a/swamid-2.0/tentaadmin.test.umu.se-shibboleth.xml
+++ b/swamid-2.0/tentaadmin.test.umu.se-shibboleth.xml
@@ -91,9 +91,9 @@ k0b3OPSaUvVNsZGwMOZ6RUXc9dK+jXX+Xx7HoQYPlfRtBtF+e+U1alxrQXCmxF+f
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tentaadmin.test.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://tentaadmin.test.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>Tommy</md:GivenName>
     <md:SurName>Larsson</md:SurName>
     <md:EmailAddress>mailto:tommy.larsson@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/tentaadmintest.uhr.se-shibboleth.xml b/swamid-2.0/tentaadmintest.uhr.se-shibboleth.xml
index 62fb4625..cf18839d 100644
--- a/swamid-2.0/tentaadmintest.uhr.se-shibboleth.xml
+++ b/swamid-2.0/tentaadmintest.uhr.se-shibboleth.xml
@@ -86,9 +86,9 @@ OCAgWY6O9B3McR43joEl1kbkE4ckdvrpmDrGdjZn78smL6SGV2Frl5d0ALjQSVkB
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://tentaadmintest.uhr.se/Shibboleth.sso/SAML2/ECP" index="9"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tentaadmintest.uhr.se/Shibboleth.sso/SAML2/POST" index="10"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>Anders</md:GivenName>
     <md:SurName>Möllström</md:SurName>
     <md:EmailAddress>mailto:Anders.mollstrom@uhr.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/test-kmh.hr.evry.se-shibboleth.xml b/swamid-2.0/test-kmh.hr.evry.se-shibboleth.xml
index 146f9def..7cffe834 100644
--- a/swamid-2.0/test-kmh.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/test-kmh.hr.evry.se-shibboleth.xml
@@ -65,14 +65,14 @@ tFtOy/01MRdVsQQc8spn2VX6WxZsXCj1HNHrT91JARliVf+ztavCB3DOxSE=
       <md:RequestedAttribute FriendlyName="eppn" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Evry HR Solutions AB</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Evry HR Solutions AB</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.evry.se/it-tjanster/applikationstjanster-och-losningar/personal-och-lonesystem/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
+  </md:Organization><md:ContactPerson contactType="support">
     <md:GivenName>Primula</md:GivenName>
     <md:SurName>Support</md:SurName>
     <md:EmailAddress>mailto:primulasupport@evry.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/test-lartorget.sll.se-shibboleth.xml b/swamid-2.0/test-lartorget.sll.se-shibboleth.xml
index bd97866e..0ee16492 100644
--- a/swamid-2.0/test-lartorget.sll.se-shibboleth.xml
+++ b/swamid-2.0/test-lartorget.sll.se-shibboleth.xml
@@ -52,9 +52,9 @@ xYxxNbqBOO7+wQ==
     </md:KeyDescriptor>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-lartorget.sll.se/Shibboleth.sso/SAML2/POST" index="1"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
+  
+<md:ContactPerson contactType="administrative">
     <md:GivenName>Palle</md:GivenName>
     <md:SurName>Girgensohn</md:SurName>
     <md:EmailAddress>mailto:girgen@pingpong.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/test-nais.i.uhr.se-shibboleth.xml b/swamid-2.0/test-nais.i.uhr.se-shibboleth.xml
index 9e6db2f8..5fd8b9a8 100644
--- a/swamid-2.0/test-nais.i.uhr.se-shibboleth.xml
+++ b/swamid-2.0/test-nais.i.uhr.se-shibboleth.xml
@@ -93,9 +93,9 @@ BwquFopAQg==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test-nais.i.uhr.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test-nais.i.uhr.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>Carina</md:GivenName>
     <md:SurName>Lindström</md:SurName>
     <md:EmailAddress>mailto:support@reqtest-services.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/test1.release-check.swamid.se-shibboleth.xml b/swamid-2.0/test1.release-check.swamid.se-shibboleth.xml
index d4f2ff96..ff67bdb7 100644
--- a/swamid-2.0/test1.release-check.swamid.se-shibboleth.xml
+++ b/swamid-2.0/test1.release-check.swamid.se-shibboleth.xml
@@ -118,13 +118,13 @@ rtSd5rXgy930PQ==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test1.release-check.swamid.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test1.release-check.swamid.se/Shibboleth.sso/SAML2/ECP" index="4"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">SWAMID</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.swamid.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:Company>SWAMID</md:Company>
     <md:EmailAddress>mailto:operations@swamid.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/test2.release-check.swamid.se-shibboleth.xml b/swamid-2.0/test2.release-check.swamid.se-shibboleth.xml
index 8b0fca79..e7d6006c 100644
--- a/swamid-2.0/test2.release-check.swamid.se-shibboleth.xml
+++ b/swamid-2.0/test2.release-check.swamid.se-shibboleth.xml
@@ -123,13 +123,13 @@ rtSd5rXgy930PQ==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test2.release-check.swamid.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test2.release-check.swamid.se/Shibboleth.sso/SAML2/ECP" index="4"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">SWAMID</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Swedish Academic Identity Federation (SWAMID)</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.swamid.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:Company>SWAMID</md:Company>
     <md:EmailAddress>mailto:operations@swamid.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/testidpv3.lu.se-idp-shibboleth.xml b/swamid-2.0/testidpv3.lu.se-idp-shibboleth.xml
index 0d016ed3..41f7c094 100644
--- a/swamid-2.0/testidpv3.lu.se-idp-shibboleth.xml
+++ b/swamid-2.0/testidpv3.lu.se-idp-shibboleth.xml
@@ -120,29 +120,29 @@ tG9PjRBKf1z043u2YbWxjTSPUmchxSZoACzzOtSs6D6EetuRqhGHKjT7T6o=
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testidpv3.lu.se/idp/profile/SAML2/POST/SSO"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testidpv3.lu.se/idp/profile/SAML2/Redirect/SSO"/>
   </IDPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+  
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="en">LU</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Lunds universitet (Test UWDEV)</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Lund University (Test UWDEV)</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">https://www.lu.se/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <GivenName>Eskil</GivenName>
     <SurName>Swahn</SurName>
     <EmailAddress>mailto:eskil.swahn@ldc.lu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <GivenName>Johan</GivenName>
     <SurName>Silverup</SurName>
     <EmailAddress>mailto:johan.silverup@ldc.lu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <SurName>LU Servicedesk</SurName>
     <EmailAddress>mailto:servicedesk@lu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+  </ContactPerson><ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
     <GivenName>IRT Lund University</GivenName>
     <EmailAddress>mailto:abuse@lu.se</EmailAddress>
     <TelephoneNumber>+46462229000</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/testplay.hhs.se.xml b/swamid-2.0/testplay.hhs.se.xml
index 1676df08..24ad853d 100644
--- a/swamid-2.0/testplay.hhs.se.xml
+++ b/swamid-2.0/testplay.hhs.se.xml
@@ -38,13 +38,13 @@
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testplay.hhs.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">HHS (TEST)</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">HHS (TEST)</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://testplay.hhs.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:SurName>Administrator</md:SurName>
     <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/ths.instructure.com-saml2.xml b/swamid-2.0/ths.instructure.com-saml2.xml
index 439aa185..e753365f 100644
--- a/swamid-2.0/ths.instructure.com-saml2.xml
+++ b/swamid-2.0/ths.instructure.com-saml2.xml
@@ -91,13 +91,13 @@ SQJDMGy5cRRcanOu2OwE</dsig:X509Certificate>
     <md:AssertionConsumerService Location="https://ths.beta.instructure.com/login/saml" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="2" isDefault="false"/>
     <md:AssertionConsumerService Location="https://ths.test.instructure.com/login/saml" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="3" isDefault="false"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>Peter</md:GivenName>
     <md:SurName>Säll</md:SurName>
     <md:EmailAddress>mailto:info@instructure.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:SurName>Administrator</md:SurName>
     <md:EmailAddress>mailto:info@instructure.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/timesketch.cert.sunet.se-shibboleth.xml b/swamid-2.0/timesketch.cert.sunet.se-shibboleth.xml
index 06869991..7890c96a 100644
--- a/swamid-2.0/timesketch.cert.sunet.se-shibboleth.xml
+++ b/swamid-2.0/timesketch.cert.sunet.se-shibboleth.xml
@@ -83,9 +83,9 @@ A4F5+e/ZMR2dTg==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://timesketch.cert.sunet.se/Shibboleth.sso/SAML/POST" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://timesketch.cert.sunet.se/Shibboleth.sso/SAML/Artifact" index="5"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
+  
+<md:ContactPerson contactType="administrative">
     <md:GivenName>Fredrik</md:GivenName>
     <md:SurName>Pettai</md:SurName>
     <md:EmailAddress>mailto:pettai@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/tta-portal.misc.kth.se-shibboleth.xml.c b/swamid-2.0/tta-portal.misc.kth.se-shibboleth.xml.c
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/swamid-2.0/tta-portal.misc.kth.se-shibboleth.xml.c
diff --git a/swamid-2.0/tucana.sai.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/tucana.sai.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 464318f0..f25a2753 100644
--- a/swamid-2.0/tucana.sai.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/tucana.sai.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -41,8 +41,8 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://tucana.sai.kau.se/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://tucana.sai.kau.se/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>IT-avdelningen</md:GivenName>
     <md:EmailAddress>mailto:webbteknik@kau.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/ubas.lu.se-shibboleth.xml b/swamid-2.0/ubas.lu.se-shibboleth.xml
index 62c4a1b2..f8a26b32 100644
--- a/swamid-2.0/ubas.lu.se-shibboleth.xml
+++ b/swamid-2.0/ubas.lu.se-shibboleth.xml
@@ -86,9 +86,9 @@ u21VH/EFiu9zEqiF00OIOqKPItb7pgRaWF9pf1OyAmh8t9I2FjTvUG42nLMJr62+
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ubas.lu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ubas.lu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>Martin</md:GivenName>
     <md:SurName>Åhfeldt</md:SurName>
     <md:EmailAddress>mailto:martin.ahfeldt@lu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/ugit.se-sp.xml b/swamid-2.0/ugit.se-sp.xml
index b1a9f460..64f02179 100644
--- a/swamid-2.0/ugit.se-sp.xml
+++ b/swamid-2.0/ugit.se-sp.xml
@@ -67,13 +67,13 @@
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ugit.se/sp/slo/post"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ugit.se/sp/saml2/post" index="1"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">UGIT</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">UGIT</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://ugit.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:Company>UGIT</md:Company>
     <md:EmailAddress>mailto:info@ugit.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/uppsala.instructure.com-saml2.xml b/swamid-2.0/uppsala.instructure.com-saml2.xml
index a6604ae4..1ede6d50 100644
--- a/swamid-2.0/uppsala.instructure.com-saml2.xml
+++ b/swamid-2.0/uppsala.instructure.com-saml2.xml
@@ -88,17 +88,17 @@ BN+f6kyYZ9ztdvueX8SUp5T4s40=</dsig:X509Certificate>
     <md:AssertionConsumerService Location="https://uppsala.beta.instructure.com/login/saml" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="2" isDefault="false"/>
     <md:AssertionConsumerService Location="https://uppsala.test.instructure.com/login/saml" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="3" isDefault="false"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.uu.se/en</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">http://www.uu.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:Company>Uppsala universitet</md:Company>
     <md:SurName>Canvas</md:SurName>
     <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/uppsalaunilib.slack.com.xml b/swamid-2.0/uppsalaunilib.slack.com.xml
index b76dfb73..5cd73e17 100644
--- a/swamid-2.0/uppsalaunilib.slack.com.xml
+++ b/swamid-2.0/uppsalaunilib.slack.com.xml
@@ -65,17 +65,17 @@ IjNii+vPMK6Z6LJn3urNNSdT5brUXe3AqgPh9Hg9I5BTNm4eM5PlWq3KpiBq64oN
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uppsalaunilib.slack.com/sso/saml" index="1"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Uppsala University Library</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Uppsala University Library</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://ub.uu.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:GivenName>Fredrik Lysen</md:GivenName>
     <md:EmailAddress>mailto:fredrik.lysen@ub.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
+  </md:ContactPerson><md:ContactPerson contactType="support">
     <md:GivenName>IT</md:GivenName>
     <md:EmailAddress>mailto:it@ub.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/urn-auth0-safarijv-uppsala-university.xml b/swamid-2.0/urn-auth0-safarijv-uppsala-university.xml
index 03bd6f57..aeb68908 100644
--- a/swamid-2.0/urn-auth0-safarijv-uppsala-university.xml
+++ b/swamid-2.0/urn-auth0-safarijv-uppsala-university.xml
@@ -52,21 +52,21 @@ xuvjUFEYjJuhY/HwYbmCghKebqIusOEkfaLO0HZmwpI=
       <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
     </AttributeConsumingService>
   </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="en">O'Reilly Media</OrganizationName>
     <OrganizationDisplayName xml:lang="en">Safari Books Online</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">https://www.oreilly.com/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <GivenName>Jesse Banning</GivenName>
     <EmailAddress>mailto:safari-prof-serv@oreilly.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <GivenName>Jesse Banning</GivenName>
     <EmailAddress>mailto:safari-prof-serv@oreilly.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+  </ContactPerson><ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
     <GivenName>Matt Kirk</GivenName>
     <EmailAddress>mailto:security-feedback@oreilly.com</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/use-nai.sitevision.se.xml b/swamid-2.0/use-nai.sitevision.se.xml
index c5d85c8e..fd50182b 100644
--- a/swamid-2.0/use-nai.sitevision.se.xml
+++ b/swamid-2.0/use-nai.sitevision.se.xml
@@ -35,13 +35,13 @@ ocEdp31x+MlteKxIGncaBzTpfpdPWs6DZ+cA1/XLCbZgKtQPqohzRQ==</ds:X509Certificate>
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://use-nai.sitevision.se/saml/LogoutServiceHTTPRedirect" ResponseLocation="https://use-nai.sitevision.se/saml/LogoutServiceHTTPRedirectResponse"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://use-nai.sitevision.se/saml/SAMLAssertionConsumer" index="0" isDefault="true"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Nordiska Afrikainstitutet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Nordiska Afrikainstitutet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://use-nai.sitevision.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:Company>Nordiska Afrikainstitutet</md:Company>
     <md:EmailAddress>mailto:sebastian.danielsson@nai.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/uu-se.zoom.us.xml b/swamid-2.0/uu-se.zoom.us.xml
index aaffe9f5..c0bd872b 100644
--- a/swamid-2.0/uu-se.zoom.us.xml
+++ b/swamid-2.0/uu-se.zoom.us.xml
@@ -111,25 +111,25 @@ KtkbHqa5j2Fc+W/dXVqo28kQKbMm+FF9Vj6cQ1B/xPdijb7M2rHL808qVYPpJ9y1vahFh07yyTOR
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uu-se.zoom.us/saml/SSO" index="0" isDefault="true"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uu-se.zoom.us/saml/SSO" index="1"/>
   </md:SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="sv">Uppsala universitet</OrganizationName>
     <OrganizationName xml:lang="en">Uppsala University</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Uppsala universitet</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Uppsala University</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv">http://www.uu.se/</OrganizationURL>
     <OrganizationURL xml:lang="en">http://www.uu.se/en/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>Uppsala universitet</Company>
     <EmailAddress>mailto:servicedesk@uu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>Uppsala universitet</Company>
     <EmailAddress>mailto:servicedesk@uu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <Company>Uppsala universitet</Company>
     <EmailAddress>mailto:servicedesk@uu.se</EmailAddress>
     <TelephoneNumber>+46184714400</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/uuc-web003-t.its.uu.se-shibboleth.xml b/swamid-2.0/uuc-web003-t.its.uu.se-shibboleth.xml
index 34ddacf1..980c7dbd 100644
--- a/swamid-2.0/uuc-web003-t.its.uu.se-shibboleth.xml
+++ b/swamid-2.0/uuc-web003-t.its.uu.se-shibboleth.xml
@@ -103,15 +103,15 @@ R+DVLFswqfvJvRRyTA==
       <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
+  
+  
+  
+<md:ContactPerson contactType="administrative">
     <md:EmailAddress>mailto:indico-datordrift@its.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:EmailAddress>mailto:indico-datordrift@its.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+  </md:ContactPerson><md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
     <md:GivenName>Uppsala University Computer Security Incident Response Team</md:GivenName>
     <md:EmailAddress>mailto:security@uu.se</md:EmailAddress>
     <md:TelephoneNumber>+46-18-4717560</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/vartuppdrag.se.xml b/swamid-2.0/vartuppdrag.se.xml
index 603e9c49..4c9d6abb 100644
--- a/swamid-2.0/vartuppdrag.se.xml
+++ b/swamid-2.0/vartuppdrag.se.xml
@@ -76,9 +76,9 @@
     <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vartuppdrag.se/saml2/acs" index="1"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>Fredrik</md:GivenName>
     <md:SurName>Croneborg</md:SurName>
     <md:EmailAddress>mailto:fredrik@learnways.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/vfu-dev2.su.se-shibboleth.sso.xml b/swamid-2.0/vfu-dev2.su.se-shibboleth.sso.xml
index b62c55f6..85a2cc95 100644
--- a/swamid-2.0/vfu-dev2.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/vfu-dev2.su.se-shibboleth.sso.xml
@@ -100,8 +100,8 @@ TGTrHmlHzO3S+jXDrdj4fydQJwnJCsqcQbTQgqU=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vfu-dev2.su.se/Shibboleth.sso/SAML2/Artifact" index="8"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vfu-dev2.su.se/Shibboleth.sso/SAML2/ECP" index="9"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:SurName>IT-avdelningen</md:SurName>
     <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/vfu-gemdev.it.su.se-shibboleth.sso.xml b/swamid-2.0/vfu-gemdev.it.su.se-shibboleth.sso.xml
index ada3e19d..06a02522 100644
--- a/swamid-2.0/vfu-gemdev.it.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/vfu-gemdev.it.su.se-shibboleth.sso.xml
@@ -90,8 +90,8 @@ UaFs0ulwkp2uVhPCL1SV0KFnIWeKpY9rkcacQlpaDxwK5TKUnmw3zA==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vfu-gemdev.it.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vfu-gemdev.it.su.se/Shibboleth.sso/SAML2/ECP" index="10"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:SurName>IT-avdelningen</md:SurName>
     <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/webinar.nordu.net-shibboleth.xml b/swamid-2.0/webinar.nordu.net-shibboleth.xml
index 1455c274..a0c86c11 100644
--- a/swamid-2.0/webinar.nordu.net-shibboleth.xml
+++ b/swamid-2.0/webinar.nordu.net-shibboleth.xml
@@ -81,13 +81,13 @@ euZKcqmem+nEk8ZZsFxhsTwGLzwlgA+2TEJnP3AeRTiPLzvbYTUprgL0gKt7pg==
       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false" Name="urn:oid:2.16.840.1.113730.3.1.241"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">NORDUnet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">NORDUnet A/S</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.nordu.net</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:Company>NORDUnet NOC</md:Company>
     <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/weblogin-test.kau.se-idp-shibboleth.xml b/swamid-2.0/weblogin-test.kau.se-idp-shibboleth.xml
index 73b0736b..729cdc04 100644
--- a/swamid-2.0/weblogin-test.kau.se-idp-shibboleth.xml
+++ b/swamid-2.0/weblogin-test.kau.se-idp-shibboleth.xml
@@ -132,26 +132,26 @@ tcbcOrD8hYtnkJ0VE3Ns
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin-test.kau.se/idp/profile/SAML2/POST/SSO"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin-test.kau.se/idp/profile/SAML2/Redirect/SSO"/>
   </IDPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="en">KAU</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Karlstads universitet test</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Karlstad University test</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.kau.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>Karlstad University</Company>
     <SurName>IT-avdelningen</SurName>
     <EmailAddress>mailto:webbteknik@kau.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>Karlstad University</Company>
     <SurName>IT-avdelningen</SurName>
     <EmailAddress>mailto:webbteknik@kau.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <Company>Karlstad University</Company>
     <SurName>IT-avdelningen</SurName>
     <EmailAddress>mailto:2525@kau.se</EmailAddress>
     <TelephoneNumber>+46 54 700 2525</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/weblogin.kau.se-idp-shibboleth.xml b/swamid-2.0/weblogin.kau.se-idp-shibboleth.xml
index e918d7a3..b4240b72 100644
--- a/swamid-2.0/weblogin.kau.se-idp-shibboleth.xml
+++ b/swamid-2.0/weblogin.kau.se-idp-shibboleth.xml
@@ -212,33 +212,33 @@ cHgs7D1QiqGixbmFlSZyPcCPcIzPDzRaoXyb+yKQy31QP/VEt8VGXH5H2A==
     </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin.kau.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
   </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+  
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="en">KAU</OrganizationName>
     <OrganizationName xml:lang="sv">KAU</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Karlstads universitet</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Karlstad University</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.kau.se/en</OrganizationURL>
     <OrganizationURL xml:lang="sv">http://www.kau.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>Karlstad University</Company>
     <SurName>IT-avdelningen</SurName>
     <EmailAddress>mailto:2525@kau.se</EmailAddress>
     <TelephoneNumber>+46 54 700 2525</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>Karlstad University</Company>
     <SurName>IT-avdelningen</SurName>
     <EmailAddress>mailto:webbteknik@kau.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <Company>Karlstad University</Company>
     <SurName>IT-avdelningen Karlstads universitet</SurName>
     <EmailAddress>mailto:datasupport@kau.se</EmailAddress>
     <TelephoneNumber>+46 54 700 2525</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+  </ContactPerson><ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
     <GivenName>Incident Response Team</GivenName>
     <EmailAddress>mailto:irt@kau.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/weblogin.test.uu.se-idp-shibboleth.xml b/swamid-2.0/weblogin.test.uu.se-idp-shibboleth.xml
index 02388aa6..1a3a9900 100644
--- a/swamid-2.0/weblogin.test.uu.se-idp-shibboleth.xml
+++ b/swamid-2.0/weblogin.test.uu.se-idp-shibboleth.xml
@@ -228,30 +228,30 @@ dqPteAxhBzLEflg+
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
   </AttributeAuthorityDescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+  
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="sv">Uppsala universitet</OrganizationName>
     <OrganizationName xml:lang="en">Uppsala University</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Uppsala universitet TEST</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Uppsala University TEST</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv">http://www.uu.se/</OrganizationURL>
     <OrganizationURL xml:lang="en">http://www.uu.se/en/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>Uppsala universitet</Company>
     <EmailAddress>mailto:drift@uadm.uu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>Uppsala universitet</Company>
     <EmailAddress>mailto:drift@uadm.uu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <Company>Uppsala universitet</Company>
     <EmailAddress>mailto:servicedesk@uu.se</EmailAddress>
     <TelephoneNumber>+46184714400</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
+  </ContactPerson><ContactPerson xmlns:remd="http://refeds.org/metadata" xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
     <GivenName>Uppsala University Computer Security Incident Response Team</GivenName>
     <EmailAddress>mailto:security@uu.se</EmailAddress>
     <TelephoneNumber>+46184717560</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/webwork.math.su.se-shibboleth.xml b/swamid-2.0/webwork.math.su.se-shibboleth.xml
index 603b0cf9..f69a7e5b 100644
--- a/swamid-2.0/webwork.math.su.se-shibboleth.xml
+++ b/swamid-2.0/webwork.math.su.se-shibboleth.xml
@@ -40,15 +40,15 @@ x4wDuJ8mbDVyyw==</ds:X509Certificate>
     </KeyDescriptor>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://webwork.math.su.se/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
   </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="en">SU</OrganizationName>
     <OrganizationDisplayName xml:lang="en">Stockholm university</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.su.se</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>Stockholm university</Company>
     <GivenName>Tomas</GivenName>
     <SurName>Ericsson</SurName>
     <EmailAddress>mailto:te@math.su.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/wiki.its.uu.se-shibboleth.xml b/swamid-2.0/wiki.its.uu.se-shibboleth.xml
index 5425a547..8d08a4ce 100644
--- a/swamid-2.0/wiki.its.uu.se-shibboleth.xml
+++ b/swamid-2.0/wiki.its.uu.se-shibboleth.xml
@@ -49,25 +49,25 @@ oRKVGees9hV1yjdopT21LpRoP51+BZSaPKC3HC84mM8E/1hm6zznifrP/w==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki.its.uu.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki.its.uu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
   </md:SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="sv">Uppsala universitet</OrganizationName>
     <OrganizationName xml:lang="en">Uppsala University</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Uppsala universitet</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Uppsala University</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv">http://www.uu.se/</OrganizationURL>
     <OrganizationURL xml:lang="en">http://www.uu.se/en/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>Uppsala universitet</Company>
     <EmailAddress>mailto:drift@uadm.uu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>Uppsala universitet</Company>
     <EmailAddress>mailto:drift@uadm.uu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <Company>Uppsala universitet</Company>
     <EmailAddress>mailto:servicedesk@uu.se</EmailAddress>
     <TelephoneNumber>+46184714400</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/wiki2.its.uu.se-shibboleth.xml b/swamid-2.0/wiki2.its.uu.se-shibboleth.xml
index 473c417f..d40260af 100644
--- a/swamid-2.0/wiki2.its.uu.se-shibboleth.xml
+++ b/swamid-2.0/wiki2.its.uu.se-shibboleth.xml
@@ -49,25 +49,25 @@ oRKVGees9hV1yjdopT21LpRoP51+BZSaPKC3HC84mM8E/1hm6zznifrP/w==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wiki2.its.uu.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wiki2.its.uu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
   </md:SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="sv">Uppsala universitet</OrganizationName>
     <OrganizationName xml:lang="en">Uppsala University</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Uppsala universitet</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Uppsala University</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv">http://www.uu.se/</OrganizationURL>
     <OrganizationURL xml:lang="en">http://www.uu.se/en/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>Uppsala universitet</Company>
     <EmailAddress>mailto:drift@uadm.uu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>Uppsala universitet</Company>
     <EmailAddress>mailto:drift@uadm.uu.se</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <Company>Uppsala universitet</Company>
     <EmailAddress>mailto:servicedesk@uu.se</EmailAddress>
     <TelephoneNumber>+46184714400</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/www.akademiskahogtider.se-shibboleth.xml b/swamid-2.0/www.akademiskahogtider.se-shibboleth.xml
index e1bfe198..fd155f0a 100644
--- a/swamid-2.0/www.akademiskahogtider.se-shibboleth.xml
+++ b/swamid-2.0/www.akademiskahogtider.se-shibboleth.xml
@@ -54,12 +54,12 @@ EYEYIwfyu/uReqojWsIHxQ==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.akademiskahogtider.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.akademiskahogtider.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
+  
+  
+<md:ContactPerson contactType="administrative">
     <md:GivenName>Teknisk webmaster</md:GivenName>
     <md:EmailAddress>mailto:techweb@it.liu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:GivenName>Teknisk webmaster</md:GivenName>
     <md:EmailAddress>mailto:techweb@it.liu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml b/swamid-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml
index 4a548c68..4a256936 100644
--- a/swamid-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml
+++ b/swamid-2.0/www.mediafora.net-simplesaml-module.php-saml-sp-metadata.php-media-network-sp.xml
@@ -51,13 +51,13 @@
       <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Danish e-Infrastructure Cooperation</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Danish e-Infrastructure Cooperation (DeIC)</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.deic.dk</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:GivenName>Administrator</md:GivenName>
     <md:EmailAddress>mailto:netdrift@deic.dk</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/www.student.ladok.se-student-sp.xml b/swamid-2.0/www.student.ladok.se-student-sp.xml
index 72dce986..17b9b95d 100644
--- a/swamid-2.0/www.student.ladok.se-student-sp.xml
+++ b/swamid-2.0/www.student.ladok.se-student-sp.xml
@@ -77,22 +77,22 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.student.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.student.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
+  
+  
+  
+<md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
+  </md:ContactPerson><md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Ladok-supporten</md:SurName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/www.test.ladok.se-gui-sp.xml b/swamid-2.0/www.test.ladok.se-gui-sp.xml
index 1c3b9857..e1c286a5 100644
--- a/swamid-2.0/www.test.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.test.ladok.se-gui-sp.xml
@@ -76,22 +76,22 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.test.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.test.ladok.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
+  
+  
+  
+<md:ContactPerson contactType="administrative">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Fredrik Domeij</md:SurName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
+  </md:ContactPerson><md:ContactPerson contactType="support">
     <md:Company>ITS, Umeå universitet</md:Company>
     <md:SurName>Ladok-supporten</md:SurName>
     <md:EmailAddress>mailto:ladoksupport@its.umu.se</md:EmailAddress>
     <md:TelephoneNumber>46907866600</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/www3.genuinetext.com-shibboleth.xml b/swamid-2.0/www3.genuinetext.com-shibboleth.xml
index 8b6fbcd4..b890f83c 100644
--- a/swamid-2.0/www3.genuinetext.com-shibboleth.xml
+++ b/swamid-2.0/www3.genuinetext.com-shibboleth.xml
@@ -31,15 +31,15 @@ v6nJ+bzAScGjfHk=</ds:X509Certificate>
     </KeyDescriptor>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www3.genuinetext.com/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
   </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="en">Genuine Text</OrganizationName>
     <OrganizationDisplayName xml:lang="en">Genuine Text</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.genuinetext.com</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>Knownet AB</Company>
     <GivenName>Richard</GivenName>
     <SurName>Bäckman</SurName>
     <EmailAddress>mailto:rickard@knonet.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/xfire.mimas.ac.uk-shibboleth.xml b/swamid-2.0/xfire.mimas.ac.uk-shibboleth.xml
index 71a09c5a..f58b91e7 100644
--- a/swamid-2.0/xfire.mimas.ac.uk-shibboleth.xml
+++ b/swamid-2.0/xfire.mimas.ac.uk-shibboleth.xml
@@ -21,23 +21,23 @@
     </KeyDescriptor>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://xfire.mimas.ac.uk/Shibboleth.sso/SAML/POST" index="1" isDefault="true"/>
   </SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+  
+  
+<Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
     <OrganizationName xml:lang="en">MIMAS</OrganizationName>
     <OrganizationDisplayName xml:lang="en">MIMAS</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://xfire.mimas.ac.uk</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <SurName>CrossFire Helpdesk</SurName>
     <EmailAddress>mailto:crossfire@mimas.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <GivenName>david</GivenName>
     <SurName>Chaplin</SurName>
     <EmailAddress>mailto:david.chaplin@manchester.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <GivenName>Ross</GivenName>
     <SurName>Macintyre</SurName>
     <EmailAddress>mailto:Ross.MacIntyre@manchester.ac.uk</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/zoom-saas-idp-proxy.sunet.se-sp.xml b/swamid-2.0/zoom-saas-idp-proxy.sunet.se-sp.xml
index 6d56bc62..3becd5fa 100644
--- a/swamid-2.0/zoom-saas-idp-proxy.sunet.se-sp.xml
+++ b/swamid-2.0/zoom-saas-idp-proxy.sunet.se-sp.xml
@@ -87,17 +87,17 @@ Mxe0+tX0hEXUAHD3qoocrc5Nn5gXeDpmZA4Ik8dtzyPj8AkGUtekHt8=
     <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zoom-saas-idp-proxy.sunet.se/Saml2SP/acs/post" index="1"/>
     <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://zoom-saas-idp-proxy.sunet.se/Saml2SP/acs/redirect" index="2"/>
   </ns0:SPSSODescriptor>
-  <ns0:Organization xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+  
+<ns0:Organization xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata">
     <ns0:OrganizationName xml:lang="en">SUNET Zoom</ns0:OrganizationName>
     <ns0:OrganizationDisplayName xml:lang="en">SUNET Zoom</ns0:OrganizationDisplayName>
     <ns0:OrganizationURL xml:lang="en">https://sunet.se</ns0:OrganizationURL>
-  </ns0:Organization>
-  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </ns0:Organization><ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <ns0:GivenName>Technical</ns0:GivenName>
     <ns0:EmailAddress>mailto:noc@sunet.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
-  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+  </ns0:ContactPerson><ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <ns0:GivenName>Support</ns0:GivenName>
     <ns0:EmailAddress>mailto:noc@sunet.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
-</md:EntityDescriptor>
+  </ns0:ContactPerson></md:EntityDescriptor>
author	Leif Johansson <leifj@sunet.se>	2019-11-20 08:35:28 +0100
committer	Leif Johansson <leifj@sunet.se>	2019-11-20 08:35:28 +0100
commit	07b2ea84983d757b346a4c45e759aeee3267e6ea (patch)
tree	04e9b37b1e51ad8706a179230c566cdbd947feab /swamid-2.0
parent	922f80dcb442c0a7d51dedd6052b0e44c4d45148 (diff)