skolverket uat SP

author: Leif Johansson <leifj@sunet.se> 2019-09-11 08:05:44 +0200
committer: Leif Johansson <leifj@sunet.se> 2019-09-11 08:05:44 +0200
commit: 3c41b5582b117ff0829608674b68e2a35bd3baca (patch)
tree: 27b73b0648578cb3af590d0472f4f3ad809a35ad /swamid-2.0
parent: 66f98c1a84d6fccccbd2730c25edc5a05227ce4b (diff)
525 files changed, 2897 insertions, 2875 deletions
diff --git a/swamid-2.0/38caledon.ddns.net-shibboleth.xml b/swamid-2.0/38caledon.ddns.net-shibboleth.xml
index d6b174f9..716b73d4 100644
--- a/swamid-2.0/38caledon.ddns.net-shibboleth.xml
+++ b/swamid-2.0/38caledon.ddns.net-shibboleth.xml
@@ -42,20 +42,20 @@ vqPkpXz/sSaX2zcm5JM1v3Jkk0D56Jbj+DGBkdpeWdNoqyUzF7JWVpArwEVOQWs=
     </md:KeyDescriptor>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://38caledon.ddns.net/Shibboleth.sso/SAML2/POST" index="4"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Alan P3W test SP</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Alan P3W test
 SP</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://38caledon.ddns.net/shibboleth</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
+  </md:Organization><md:ContactPerson contactType="administrative">
     <md:GivenName>Alan</md:GivenName>
     <md:SurName>Buxey</md:SurName>
     <md:EmailAddress>mailto:alan.buxey@myunidays.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
+  </md:ContactPerson><md:ContactPerson contactType="support">
     <md:GivenName>Alan</md:GivenName>
     <md:SurName>Buxey</md:SurName>
     <md:EmailAddress>mailto:alan.buxey@myunidays.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/acc.bedomningshandboken.uhr.se-shibboleth.xml b/swamid-2.0/acc.bedomningshandboken.uhr.se-shibboleth.xml
index 94895d52..528a83f5 100644
--- a/swamid-2.0/acc.bedomningshandboken.uhr.se-shibboleth.xml
+++ b/swamid-2.0/acc.bedomningshandboken.uhr.se-shibboleth.xml
@@ -126,19 +126,19 @@ ut8A71AN/z8omfWkOpv19vkKMMqNng1j0iw2cSCey2B1Ox2OWiPXuCJI
       <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="technical">
+  
+  
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>Eric</md:GivenName>
     <md:SurName>Jonsson</md:SurName>
     <md:EmailAddress>mailto:eric.jonsson@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
+  </md:ContactPerson><md:ContactPerson contactType="administrative">
     <md:GivenName>Eric</md:GivenName>
     <md:SurName>Jonsson</md:SurName>
     <md:EmailAddress>mailto:eric.jonsson@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
+  </md:ContactPerson><md:ContactPerson contactType="support">
     <md:GivenName>Eric</md:GivenName>
     <md:SurName>Jonsson</md:SurName>
     <md:EmailAddress>mailto:eric.jonsson@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/acc.valda.uhr.se-shibboleth.xml b/swamid-2.0/acc.valda.uhr.se-shibboleth.xml
index 5203a0ed..35e0116b 100644
--- a/swamid-2.0/acc.valda.uhr.se-shibboleth.xml
+++ b/swamid-2.0/acc.valda.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.valda.uhr.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://acc.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/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/account.liu.se-shibboleth-sp.xml b/swamid-2.0/account.liu.se-shibboleth-sp.xml
index 1d279332..f1aa92c9 100644
--- a/swamid-2.0/account.liu.se-shibboleth-sp.xml
+++ b/swamid-2.0/account.liu.se-shibboleth-sp.xml
@@ -82,22 +82,22 @@ CP6HXDWqslCprTd/jZgMGAOpLsCTNIOwicpOR/R2OuV2ZEol6aSJAFw/fIqsPCLJ
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://account.liu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://account.liu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="sv">Linköpings universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Linköpings universitet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">http://www.liu.se/?l=sv</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">http://www.liu.se/?l=en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
+  </md:Organization><md:ContactPerson contactType="administrative">
     <md:SurName>LiU-IT SAML admins</md:SurName>
     <md:EmailAddress>mailto:saml-admins@it.liu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
+  </md:ContactPerson><md:ContactPerson contactType="support">
     <md:SurName>LiU-IT Helpdesk</md:SurName>
     <md:EmailAddress>mailto:helpdesk@liu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:SurName>LiU-IT SAML admins</md:SurName>
     <md:EmailAddress>mailto:saml-admins@it.liu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/accounts.bils.se-saml2-metadata.xml b/swamid-2.0/accounts.bils.se-saml2-metadata.xml
index 091d45b3..9bb1ff02 100644
--- a/swamid-2.0/accounts.bils.se-saml2-metadata.xml
+++ b/swamid-2.0/accounts.bils.se-saml2-metadata.xml
@@ -61,9 +61,9 @@ aM3Ix3yd/kE2ExTHbzAz/CVwuHbTJZvF6qHDb0YWqnKb
       <md:RequestedAttribute FriendlyName="email" Name="urn:oid:1.2.840.113549.1.9.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Bioinformatics Infrastructure for Life Sciences</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Bioinformatics Infrastructure for Life Sciences</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.bils.se/</md:OrganizationURL>
-  </md:Organization>
-</md:EntityDescriptor>
+  </md:Organization></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.hv.se-adfs-services-trust.xml b/swamid-2.0/adfs.hv.se-adfs-services-trust.xml
index 8310153b..58502419 100644
--- a/swamid-2.0/adfs.hv.se-adfs-services-trust.xml
+++ b/swamid-2.0/adfs.hv.se-adfs-services-trust.xml
@@ -58,30 +58,30 @@
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.hv.se/adfs/ls/"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.hv.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">HV</OrganizationName>
     <OrganizationName xml:lang="en">HV</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Högskolan Väst ny</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">University West new</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv">http://www.hv.se</OrganizationURL>
     <OrganizationURL xml:lang="en">http://www.hv.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 West</Company>
     <SurName>Magnus Andersson</SurName>
     <EmailAddress>mailto:Magnus.Andersson@hv.se</EmailAddress>
     <TelephoneNumber>+46 520 223193</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 West</Company>
     <SurName>Christian Jiresjö</SurName>
     <EmailAddress>mailto:Christian.Jiresjo@hv.se</EmailAddress>
     <TelephoneNumber>+46 520 223189</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 West</Company>
     <SurName>Servicedesk Högkoslan Väst</SurName>
     <EmailAddress>mailto:servicedesk@hv.se</EmailAddress>
     <TelephoneNumber>+46 520 223300</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </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.nrm.se-adfs-services-trust.xml b/swamid-2.0/adfs.nrm.se-adfs-services-trust.xml
index b80e9806..56925c42 100644
--- a/swamid-2.0/adfs.nrm.se-adfs-services-trust.xml
+++ b/swamid-2.0/adfs.nrm.se-adfs-services-trust.xml
@@ -46,27 +46,27 @@
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.nrm.se/adfs/ls/"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.nrm.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">Naturhistoriska riksmuseet</OrganizationName>
     <OrganizationName xml:lang="en">Swedish Museum of Natural History</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Naturhistoriska riksmuseet</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Swedish Museum of Natural History</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv">http://www.nrm.se</OrganizationURL>
     <OrganizationURL xml:lang="en">http://www.nrm.se/en/16.html</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">
     <Company>Naturhistoriska riksmuseet</Company>
     <SurName>Användarsupport</SurName>
     <EmailAddress>mailto:support@nrm.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>Naturhistoriska riksmuseet</Company>
     <SurName>System administration</SurName>
     <EmailAddress>mailto:sysadmin@nrm.se</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">
     <Company>Naturhistoriska riksmuseet</Company>
     <SurName>System administration</SurName>
     <EmailAddress>mailto:sysadmin@nrm.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/adfs.rkh.se-adfs-services-trust.xml b/swamid-2.0/adfs.rkh.se-adfs-services-trust.xml
index 8ff6d477..583dfefc 100644
--- a/swamid-2.0/adfs.rkh.se-adfs-services-trust.xml
+++ b/swamid-2.0/adfs.rkh.se-adfs-services-trust.xml
@@ -40,28 +40,28 @@
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.rkh.se/adfs/ls/"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.rkh.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">Röda Korsets Högskola</OrganizationName>
     <OrganizationName xml:lang="en">Swedish Red Cross University College</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Röda Korsets Högskola</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Swedish Red Cross University College</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv">http://www.rkh.se/</OrganizationURL>
     <OrganizationURL xml:lang="en">http://www.rkh.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>Röda Korsets Högskola</Company>
     <EmailAddress>mailto:servicedesk@rkh.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>Röda Korsets Högskola</Company>
     <EmailAddress>mailto:servicedesk@rkh.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>Röda Korsets Högskola</Company>
     <EmailAddress>mailto:servicedesk@rkh.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">
     <Company>Röda Korsets Högskola</Company>
     <EmailAddress>mailto:servicedesk@rkh.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/adfs.sp.se-adfs-services-trust.xml b/swamid-2.0/adfs.sp.se-adfs-services-trust.xml
index 6bc83e08..8bce591b 100644
--- a/swamid-2.0/adfs.sp.se-adfs-services-trust.xml
+++ b/swamid-2.0/adfs.sp.se-adfs-services-trust.xml
@@ -52,15 +52,15 @@
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.sp.se/adfs/ls/"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.sp.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">RISE Research Institutes of Sweden</OrganizationName>
     <OrganizationName xml:lang="en">RISE Research Institutes of Sweden</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">RISE Research Institutes of Sweden</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">RISE Research Institutes of Sweden</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv">https://www.ri.se/</OrganizationURL>
     <OrganizationURL xml:lang="en">https://www.ri.se/en</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">
     <EmailAddress>mailto:support.it@ri.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/adfs.tad.hv.se-adfs-services-trust.xml b/swamid-2.0/adfs.tad.hv.se-adfs-services-trust.xml
index 7b282b50..58a6aed9 100644
--- a/swamid-2.0/adfs.tad.hv.se-adfs-services-trust.xml
+++ b/swamid-2.0/adfs.tad.hv.se-adfs-services-trust.xml
@@ -55,9 +55,9 @@
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.tad.hv.se/adfs/ls/"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.tad.hv.se/adfs/ls/"/>
   </IDPSSODescriptor>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  
+<ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <GivenName>Pär</GivenName>
     <SurName>Lauridsen</SurName>
     <EmailAddress>mailto:par.lauridsen@hv.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></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/adfs2.gu.se-adfs-services-trust.xml b/swamid-2.0/adfs2.gu.se-adfs-services-trust.xml
index 2fef11db..f212728a 100644
--- a/swamid-2.0/adfs2.gu.se-adfs-services-trust.xml
+++ b/swamid-2.0/adfs2.gu.se-adfs-services-trust.xml
@@ -33,32 +33,32 @@
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs2.gu.se/adfs/ls/"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs2.gu.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">Göteborgs universitet</OrganizationName>
     <OrganizationName xml:lang="en">University of Gothenburg</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Göteborgs universitet (ADFS)</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">University of Gothenburg (ADFS)</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv">http://www.gu.se/</OrganizationURL>
     <OrganizationURL xml:lang="en">https://www.gu.se/english/</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>GU SAML admins</SurName>
     <EmailAddress>mailto:gukonto@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>GU SAML admins</SurName>
     <EmailAddress>mailto:gukonto@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 Helpdesk</SurName>
     <EmailAddress>mailto:support@gu.se</EmailAddress>
     <TelephoneNumber>+46 31 786 2020</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>GU Incident Response Team</GivenName>
     <EmailAddress>mailto:irt@gu.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/admin-tug-1.eduid.se-6544-saml2-metadata.xml b/swamid-2.0/admin-tug-1.eduid.se-6544-saml2-metadata.xml
index 29d8e140..09fc6ad7 100644
--- a/swamid-2.0/admin-tug-1.eduid.se-6544-saml2-metadata.xml
+++ b/swamid-2.0/admin-tug-1.eduid.se-6544-saml2-metadata.xml
@@ -59,14 +59,14 @@ iJJZ3BjPM7Q/BJ92X8XQT/47DwhoNQCqHpQzOKiH
     <ns0:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://admin-tug-1.eduid.se:6544/saml2/ls/"/>
     <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://admin-tug-1.eduid.se:6544/saml2/acs/" 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">eduID</ns0:OrganizationName>
     <ns0:OrganizationDisplayName xml:lang="en">eduID</ns0:OrganizationDisplayName>
     <ns0:OrganizationURL xml:lang="en">http://www.eduid.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:Company>eduID</ns0:Company>
     <ns0:GivenName>Sysadmin</ns0:GivenName>
     <ns0:EmailAddress>mailto:eduid-dev@SEGATE.SUNET.SE</ns0:EmailAddress>
-  </ns0:ContactPerson>
-</md:EntityDescriptor>
+  </ns0: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/administrationsverktyg.umu.se-shibboleth.xml b/swamid-2.0/administrationsverktyg.umu.se-shibboleth.xml
index a8699b09..7a397326 100644
--- a/swamid-2.0/administrationsverktyg.umu.se-shibboleth.xml
+++ b/swamid-2.0/administrationsverktyg.umu.se-shibboleth.xml
@@ -100,9 +100,9 @@ hMVy+ILnwh69da4fmqSFeR6a6+dYZc/WVpbU8KwNuIsmqkZij4YarwDS1yXRdEMh
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://administrationsverktyg.umu.se/Shibboleth.sso/SAML2/ECP" index="9"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://administrationsverktyg.umu.se/Shibboleth.sso/SAML2/POST" index="10"/>
   </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/akka-adm.uu.se-shibboleth.xml b/swamid-2.0/akka-adm.uu.se-shibboleth.xml
index 2b4e9398..f8043e9c 100644
--- a/swamid-2.0/akka-adm.uu.se-shibboleth.xml
+++ b/swamid-2.0/akka-adm.uu.se-shibboleth.xml
@@ -61,15 +61,15 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://akka-adm.uu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://akka-adm.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
   </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/aktivera-test.su.se-shibboleth.sso.xml b/swamid-2.0/aktivera-test.su.se-shibboleth.sso.xml
index 46088d1b..7e9b002c 100644
--- a/swamid-2.0/aktivera-test.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/aktivera-test.su.se-shibboleth.sso.xml
@@ -85,8 +85,8 @@ u/S7d9rEGQ==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aktivera-test.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aktivera-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/aktivera.su.se-shibboleth.sso.xml b/swamid-2.0/aktivera.su.se-shibboleth.sso.xml
index 421f82bd..cc0ba9ef 100644
--- a/swamid-2.0/aktivera.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/aktivera.su.se-shibboleth.sso.xml
@@ -85,8 +85,8 @@ mqvHC5Aeiw==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aktivera.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aktivera.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/almagest.sai.kau.se.xml b/swamid-2.0/almagest.sai.kau.se.xml
index 6149210b..7cf8b3c6 100644
--- a/swamid-2.0/almagest.sai.kau.se.xml
+++ b/swamid-2.0/almagest.sai.kau.se.xml
@@ -79,8 +79,8 @@ wGwCM8JWEBn/5y8d2MEoE88o20w=
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://almagest.sai.kau.se/Shibboleth.sso/SLO/Artifact"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://almagest.sai.kau.se/Shibboleth.sso/SAML2/POST" index="1"/>
   </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/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/anvandare.test.antagning.se-anvandare-sp.xml b/swamid-2.0/anvandare.test.antagning.se-anvandare-sp.xml
index 02c5d1ca..9ea24dd2 100644
--- a/swamid-2.0/anvandare.test.antagning.se-anvandare-sp.xml
+++ b/swamid-2.0/anvandare.test.antagning.se-anvandare-sp.xml
@@ -91,28 +91,28 @@ UWCzPZSOrRKxWNKsWOsvuQSOKyn2fcKkXJkJfulVQpiXWaju5pc=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://anvandare.test.antagning.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://anvandare.test.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.asiaportal.info.xml b/swamid-2.0/auth.asiaportal.info.xml
index e355457c..c9dcb919 100644
--- a/swamid-2.0/auth.asiaportal.info.xml
+++ b/swamid-2.0/auth.asiaportal.info.xml
@@ -44,13 +44,13 @@
       <md: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" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Nordic Institute of Asian Studies</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">NIAS - Nordic Institute of Asian Studies</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.nias.ku.dk</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:GivenName>Administrator</md:GivenName>
     <md:EmailAddress>mailto:bib@nias.ku.dk</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/authdub.bridgeapp.com-saml-metadata-fcadf6cd-b759-4923-bf03-b4d41bde6f79.xml b/swamid-2.0/authdub.bridgeapp.com-saml-metadata-fcadf6cd-b759-4923-bf03-b4d41bde6f79.xml
index e8577367..c11c4b64 100644
--- a/swamid-2.0/authdub.bridgeapp.com-saml-metadata-fcadf6cd-b759-4923-bf03-b4d41bde6f79.xml
+++ b/swamid-2.0/authdub.bridgeapp.com-saml-metadata-fcadf6cd-b759-4923-bf03-b4d41bde6f79.xml
@@ -64,20 +64,20 @@ 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://authdub.bridgeapp.com/saml/callback/fcadf6cd-b759-4923-bf03-b4d41bde6f79" index="0"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+  
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>Eskil</md:GivenName>
     <md:SurName>Swahn</md:SurName>
     <md:EmailAddress>mailto:eskil.swahn@ldu.lu.se</md:EmailAddress>
     <md:TelephoneNumber>+46 46 222 1323</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
+  </md:ContactPerson><md:ContactPerson contactType="administrative">
     <md:GivenName>Maria</md:GivenName>
     <md:SurName>Hedberg</md:SurName>
     <md:EmailAddress>mailto:maria.hedberg@ub.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
+  </md:ContactPerson><md:ContactPerson contactType="support">
     <md:SurName>LU Servicedesk</md:SurName>
     <md:EmailAddress>mailto:servicedesk@lu.se</md:EmailAddress>
     <md:TelephoneNumber>+46 46 222 9000</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/backweb.antagning.se-hubble-sp.xml b/swamid-2.0/backweb.antagning.se-hubble-sp.xml
index 8b3e9ae3..4be373ef 100644
--- a/swamid-2.0/backweb.antagning.se-hubble-sp.xml
+++ b/swamid-2.0/backweb.antagning.se-hubble-sp.xml
@@ -91,28 +91,28 @@ nTUEA0OqfI3tFzYigYztt7ALtQHK0XO5K3MdCHus2srw+NKUe6mwy3NcSv2U0SI=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://backweb.antagning.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://backweb.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/backweb.test.antagning.se-hubble-sp.xml b/swamid-2.0/backweb.test.antagning.se-hubble-sp.xml
index 9bd6aa45..6ca127b5 100644
--- a/swamid-2.0/backweb.test.antagning.se-hubble-sp.xml
+++ b/swamid-2.0/backweb.test.antagning.se-hubble-sp.xml
@@ -91,28 +91,28 @@ ihDEIZcSIfuOauweBRXYMbkL
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://backweb.test.antagning.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://backweb.test.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/bdh.local-85-shibboleth.xml b/swamid-2.0/bdh.local-85-shibboleth.xml
index e092ff80..56809fd3 100644
--- a/swamid-2.0/bdh.local-85-shibboleth.xml
+++ b/swamid-2.0/bdh.local-85-shibboleth.xml
@@ -100,19 +100,19 @@ DuMB1+WkDA6AFQItEiWBPnP8PMeaSmyVARFszw6waZ6MumNeQKmi7mK6KsQM/Fje
       <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="technical">
+  
+  
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>Therese</md:GivenName>
     <md:SurName>Majlöf</md:SurName>
     <md:EmailAddress>mailto:therese.majlov@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
+  </md:ContactPerson><md:ContactPerson contactType="administrative">
     <md:GivenName>Therese</md:GivenName>
     <md:SurName>Majlöf</md:SurName>
     <md:EmailAddress>mailto:therese.majlov@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
+  </md:ContactPerson><md:ContactPerson contactType="support">
     <md:GivenName>Therese</md:GivenName>
     <md:SurName>Majlöf</md:SurName>
     <md:EmailAddress>mailto:therese.majlov@umu.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/betafoo.nordu.net-saml2-metadata.xml b/swamid-2.0/betafoo.nordu.net-saml2-metadata.xml
index 9344f4c0..e00292de 100644
--- a/swamid-2.0/betafoo.nordu.net-saml2-metadata.xml
+++ b/swamid-2.0/betafoo.nordu.net-saml2-metadata.xml
@@ -37,10 +37,10 @@ FqI3Il3tF2U+FgOT+nizupQelaoagRNerw3p2FHEYeBaTCYiW3IF7lUMIjoX2MYI
       <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:Company>NORDUnet A/S</md:Company>
     <md:GivenName>Johan</md:GivenName>
     <md:SurName>Lundberg</md:SurName>
     <md:EmailAddress>mailto:lundberg@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md: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 4027b422..79bf7b41 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,9 +58,9 @@
       <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: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.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/canvas.education.lu.se-saml2.xml b/swamid-2.0/canvas.education.lu.se-saml2.xml
index b84bfb29..9df9ff16 100644
--- a/swamid-2.0/canvas.education.lu.se-saml2.xml
+++ b/swamid-2.0/canvas.education.lu.se-saml2.xml
@@ -124,20 +124,20 @@ 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="technical">
+  
+  
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>Eskil</md:GivenName>
     <md:SurName>Swahn</md:SurName>
     <md:EmailAddress>mailto:eskil.swahn@ldu.lu.se</md:EmailAddress>
     <md:TelephoneNumber>+46 46 222 1323</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
+  </md:ContactPerson><md:ContactPerson contactType="administrative">
     <md:GivenName>Maria</md:GivenName>
     <md:SurName>Hedberg</md:SurName>
     <md:EmailAddress>mailto:maria.hedberg@ub.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
+  </md:ContactPerson><md:ContactPerson contactType="support">
     <md:SurName>LU Servicedesk</md:SurName>
     <md:EmailAddress>mailto:servicedesk@lu.se</md:EmailAddress>
     <md:TelephoneNumber>+46 46 222 9000</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/careergate.student.uu.se-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml b/swamid-2.0/careergate.student.uu.se-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml
index 12b6a0eb..4e0b7e27 100644
--- a/swamid-2.0/careergate.student.uu.se-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml
+++ b/swamid-2.0/careergate.student.uu.se-simplesaml-module.php-saml-sp-metadata.php-gl_gateway.xml
@@ -41,9 +41,9 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://careergate.student.uu.se/simplesaml/module.php/saml/sp/saml1-acs.php/gl_gateway/artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:profiles:holder-of-key:SSO:browser" Location="https://careergate.student.uu.se/simplesaml/module.php/saml/sp/saml2-acs.php/gl_gateway" index="4"/>
   </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/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/client200-190.its.umu.se-shibboleth.xml b/swamid-2.0/client200-190.its.umu.se-shibboleth.xml
index 938c79a0..c7ecec9c 100644
--- a/swamid-2.0/client200-190.its.umu.se-shibboleth.xml
+++ b/swamid-2.0/client200-190.its.umu.se-shibboleth.xml
@@ -91,9 +91,9 @@ s/FoM2D+QJmgDulQiFTjZYzPM5Uz
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://client200-190.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://client200-190.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
+  
+<md:ContactPerson contactType="administrative">
     <md:GivenName>Andreas</md:GivenName>
     <md:SurName>Berglund</md:SurName>
     <md:EmailAddress>mailto:andreas.berglund@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/cloudmore.com-shibboleth.xml b/swamid-2.0/cloudmore.com-shibboleth.xml
index 8eae421b..792a32f1 100644
--- a/swamid-2.0/cloudmore.com-shibboleth.xml
+++ b/swamid-2.0/cloudmore.com-shibboleth.xml
@@ -86,12 +86,12 @@ KG+MY9n4aaqecV40ScxWptqZOJPVWBH4Yh1BocVylDM=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://cloudmore.com/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://cloudmore.com/Shibboleth.sso/SAML/Artifact" index="6"/>
   </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/coip.app.nordu.net-saml2-sp-metadata.xml b/swamid-2.0/coip.app.nordu.net-saml2-sp-metadata.xml
index 651a9c6b..6233ca59 100644
--- a/swamid-2.0/coip.app.nordu.net-saml2-sp-metadata.xml
+++ b/swamid-2.0/coip.app.nordu.net-saml2-sp-metadata.xml
@@ -47,21 +47,21 @@ wXXiBDXS3PNHXQnnpys=
       <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" isRequired="true"/>
     </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:GivenName>Leif</md:GivenName>
     <md:SurName>Johansson</md:SurName>
     <md:EmailAddress>mailto:leifj@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:Company>NORDUnet</md:Company>
     <md:GivenName>Johan</md:GivenName>
     <md:SurName>Berggren</md:SurName>
     <md:EmailAddress>mailto:jbn@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/confluence-test.it.su.se-shibboleth.sso.xml b/swamid-2.0/confluence-test.it.su.se-shibboleth.sso.xml
index 62a9794b..649376de 100644
--- a/swamid-2.0/confluence-test.it.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/confluence-test.it.su.se-shibboleth.sso.xml
@@ -90,8 +90,8 @@ Uc3kqnPScQ==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://confluence-test.it.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://confluence-test.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/confluence-test.its.uu.se-Shibboleth.xml b/swamid-2.0/confluence-test.its.uu.se-Shibboleth.xml
index e3eafad4..f271310b 100644
--- a/swamid-2.0/confluence-test.its.uu.se-Shibboleth.xml
+++ b/swamid-2.0/confluence-test.its.uu.se-Shibboleth.xml
@@ -102,25 +102,25 @@ mo7jda5ck9hTxIWnp3G4OA==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://confluence-test.its.uu.se/Shibboleth.sso/SAML/POST" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://confluence-test.its.uu.se/Shibboleth.sso/SAML/Artifact" index="5"/>
   </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/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/confluence.its.uu.se-shibboleth.xml b/swamid-2.0/confluence.its.uu.se-shibboleth.xml
index af34fcb0..b3f04c3d 100644
--- a/swamid-2.0/confluence.its.uu.se-shibboleth.xml
+++ b/swamid-2.0/confluence.its.uu.se-shibboleth.xml
@@ -102,25 +102,25 @@ GpYW8E7+
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://confluence.its.uu.se/Shibboleth.sso/SAML/POST" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://confluence.its.uu.se/Shibboleth.sso/SAML/Artifact" index="5"/>
   </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/connect-beta.sunet.se-shibboleth.xml b/swamid-2.0/connect-beta.sunet.se-shibboleth.xml
index 1382c94a..bcdcb6ba 100644
--- a/swamid-2.0/connect-beta.sunet.se-shibboleth.xml
+++ b/swamid-2.0/connect-beta.sunet.se-shibboleth.xml
@@ -100,13 +100,13 @@ H/AVOR5U++JOt28OOfoi7mtxOFPxkge3AooWLNFOEOGMSF78BG8NCrT0l59OnAtN
       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" 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/connect-stable.sunet.se-shibboleth.xml b/swamid-2.0/connect-stable.sunet.se-shibboleth.xml
index a12fc98b..349a2fa0 100644
--- a/swamid-2.0/connect-stable.sunet.se-shibboleth.xml
+++ b/swamid-2.0/connect-stable.sunet.se-shibboleth.xml
@@ -97,13 +97,13 @@ SgXS3Q4K3pF+qwGrb3INKQ==
       <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/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/connect2.sunet.se-shibboleth.xml b/swamid-2.0/connect2.sunet.se-shibboleth.xml
index 6b153445..721ea672 100644
--- a/swamid-2.0/connect2.sunet.se-shibboleth.xml
+++ b/swamid-2.0/connect2.sunet.se-shibboleth.xml
@@ -95,13 +95,13 @@ WjepeAfFouWXq1BM0IoQcZFNRJ4Dr82fJHt6PsVEKidDo7L8vfSRc+8gOp+K41m5
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://connect2.sunet.se/Shibboleth.sso/SLO/Artifact"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://connect2.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/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 f80a1346..24130551 100644
--- a/swamid-2.0/crowd.nordu.net-shibboleth.xml
+++ b/swamid-2.0/crowd.nordu.net-shibboleth.xml
@@ -100,8 +100,8 @@ 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:ContactPerson contactType="technical">
+  
+<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/crowd.ub.uu.se-crowd-plugins-servlet-ssocookie.xml b/swamid-2.0/crowd.ub.uu.se-crowd-plugins-servlet-ssocookie.xml
index 561041b8..a0d36b31 100644
--- a/swamid-2.0/crowd.ub.uu.se-crowd-plugins-servlet-ssocookie.xml
+++ b/swamid-2.0/crowd.ub.uu.se-crowd-plugins-servlet-ssocookie.xml
@@ -57,18 +57,18 @@ KKh9ztE=
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://crowd.ub.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://crowd.ub.uu.se/Shibboleth.sso/SAML2/ECP" index="2"/>
   </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">Uppsala University Library</OrganizationName>
     <OrganizationName xml:lang="sv">Uppsala universitetsbibliotek</OrganizationName>
     <OrganizationDisplayName xml:lang="en">Uppsala University Library</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="sv">Uppsala universitetsbibliotek</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv">http://ub.uu.se</OrganizationURL>
     <OrganizationURL xml:lang="en">http://ub.uu.se/?languageId=1</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>Uppsala University Library</Company>
     <GivenName>Rasmus</GivenName>
     <SurName>Skagersten</SurName>
     <EmailAddress>mailto:helpdesk@ub.uu.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </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/cwd02.ub.uu.se-plugins-servlet-ssocookie.xml b/swamid-2.0/cwd02.ub.uu.se-plugins-servlet-ssocookie.xml
index ca2ccafb..0b8121ec 100644
--- a/swamid-2.0/cwd02.ub.uu.se-plugins-servlet-ssocookie.xml
+++ b/swamid-2.0/cwd02.ub.uu.se-plugins-servlet-ssocookie.xml
@@ -59,18 +59,18 @@ uUvzDUHce7i+YJ8NKvTj+oD5I1Ij0s4mrtoZOhsdi9pVvFk=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cwd02.ub.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://cwd02.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.dsv.su.se-shibboleth.xml b/swamid-2.0/daisy.dsv.su.se-shibboleth.xml
index b7c248cd..bb01e29d 100644
--- a/swamid-2.0/daisy.dsv.su.se-shibboleth.xml
+++ b/swamid-2.0/daisy.dsv.su.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.dsv.su.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://daisy.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/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/data.houseoffinance.se-shibboleth.xml b/swamid-2.0/data.houseoffinance.se-shibboleth.xml
index 36a1a6bb..71fabc5f 100644
--- a/swamid-2.0/data.houseoffinance.se-shibboleth.xml
+++ b/swamid-2.0/data.houseoffinance.se-shibboleth.xml
@@ -84,9 +84,9 @@ bi+i8GP0b/0=
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://data.houseoffinance.se/Shibboleth.sso/SLO/Artifact"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://data.houseoffinance.se/Shibboleth.sso/SAML2/POST" index="1"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
+  
+<md:ContactPerson contactType="administrative">
     <md:GivenName>Carmine</md:GivenName>
     <md:SurName>Palombo</md:SurName>
     <md:EmailAddress>mailto:Carmine.Palombo@hhs.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/dbhprod.uhr.se-shibboleth.xml b/swamid-2.0/dbhprod.uhr.se-shibboleth.xml
index 1c1ad33c..f809cb2d 100644
--- a/swamid-2.0/dbhprod.uhr.se-shibboleth.xml
+++ b/swamid-2.0/dbhprod.uhr.se-shibboleth.xml
@@ -95,9 +95,9 @@ GCB2r29GXIAUYaUyAdsWXNMFG6lb7IM=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dbhprod.uhr.se/Shibboleth.sso/SAML/POST" index="10"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dbhprod.uhr.se/Shibboleth.sso/SAML/Artifact" index="11"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
+  
+<md:ContactPerson contactType="administrative">
     <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/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/demo.weblogin.uu.se-idp-shibboleth.xml b/swamid-2.0/demo.weblogin.uu.se-idp-shibboleth.xml
index 688a65f0..da20c4ec 100644
--- a/swamid-2.0/demo.weblogin.uu.se-idp-shibboleth.xml
+++ b/swamid-2.0/demo.weblogin.uu.se-idp-shibboleth.xml
@@ -102,26 +102,26 @@ czuyQatrgEL0HlWr
     <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
   </md:AttributeAuthorityDescriptor>
-  <md:Organization>
+  
+  
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">UU</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">DEMO Uppsala universitet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">DEMO Uppsala University</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.uu.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
+  </md:Organization><md:ContactPerson contactType="administrative">
     <md:Company>Uppsala University</md:Company>
     <md:SurName>Team Plattform</md:SurName>
     <md:EmailAddress>mailto:uadm-team_plattform@lists.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:Company>Uppsala University</md:Company>
     <md:SurName>John Morrison</md:SurName>
     <md:EmailAddress>mailto:john.morrison@uadm.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
+  </md:ContactPerson><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/dev-us.cloudmore.com-shibboleth.xml b/swamid-2.0/dev-us.cloudmore.com-shibboleth.xml
index 0d955f64..009cd1e8 100644
--- a/swamid-2.0/dev-us.cloudmore.com-shibboleth.xml
+++ b/swamid-2.0/dev-us.cloudmore.com-shibboleth.xml
@@ -93,12 +93,12 @@ LAkq68U=
       <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.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.ladok.se-wp-content-plugins-simplesamlphp-www-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/dev.ladok.se-wp-content-plugins-simplesamlphp-www-module.php-saml-sp-metadata.php-default-sp.xml
index 38138e72..1abf081f 100644
--- a/swamid-2.0/dev.ladok.se-wp-content-plugins-simplesamlphp-www-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/dev.ladok.se-wp-content-plugins-simplesamlphp-www-module.php-saml-sp-metadata.php-default-sp.xml
@@ -39,8 +39,8 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.ladok.se/wp-content/plugins/simplesamlphp/www/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://dev.ladok.se/wp-content/plugins/simplesamlphp/www/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>Administrator</md:GivenName>
     <md:EmailAddress>mailto:anders.prinz@umu.se</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.nais.uhr.se-shibboleth.xml b/swamid-2.0/dev.nais.uhr.se-shibboleth.xml
index e11ca73c..2e03f2eb 100644
--- a/swamid-2.0/dev.nais.uhr.se-shibboleth.xml
+++ b/swamid-2.0/dev.nais.uhr.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.nais.uhr.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.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/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.play.smdb.kb.se.xml b/swamid-2.0/dev.play.smdb.kb.se.xml
index 8883e4d6..0ffbb358 100644
--- a/swamid-2.0/dev.play.smdb.kb.se.xml
+++ b/swamid-2.0/dev.play.smdb.kb.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.smdb.kb.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">SMDB Play (DEV)</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">SMDB Play (DEV)</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://dev.play.smdb.kb.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.play.sunet.se.xml b/swamid-2.0/dev.play.sunet.se.xml
index 228184f9..10f2c975 100644
--- a/swamid-2.0/dev.play.sunet.se.xml
+++ b/swamid-2.0/dev.play.sunet.se.xml
@@ -30,13 +30,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.sunet.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">SUNET (DEV)</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">SUNET (DEV)</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://dev.play.sunet.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/devrb.lbic.lu.se.xml b/swamid-2.0/devrb.lbic.lu.se.xml
index 94285288..e420f952 100644
--- a/swamid-2.0/devrb.lbic.lu.se.xml
+++ b/swamid-2.0/devrb.lbic.lu.se.xml
@@ -40,9 +40,9 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ext-devrb.lbic.lu.se/simplesaml/module.php/saml/sp/saml2-acs.php/devrb" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ext-devrb.lbic.lu.se/simplesaml/module.php/saml/sp/saml1-acs.php/devrb/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/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/diskus-demo.ub.uu.se-saml-metadata.xml b/swamid-2.0/diskus-demo.ub.uu.se-saml-metadata.xml
index fc4e20d1..a11dc637 100644
--- a/swamid-2.0/diskus-demo.ub.uu.se-saml-metadata.xml
+++ b/swamid-2.0/diskus-demo.ub.uu.se-saml-metadata.xml
@@ -33,17 +33,17 @@
     <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://diskus-demo.ub.uu.se/saml/acs" 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</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.ub.ud.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>Helpdesk</md:GivenName>
     <md:EmailAddress>mailto:helpdesk@ub.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/diskus.ub.uu.se-saml-metadata.xml b/swamid-2.0/diskus.ub.uu.se-saml-metadata.xml
index 85979ce9..630fee45 100644
--- a/swamid-2.0/diskus.ub.uu.se-saml-metadata.xml
+++ b/swamid-2.0/diskus.ub.uu.se-saml-metadata.xml
@@ -33,17 +33,17 @@
     <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://diskus.ub.uu.se/saml/acs" 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</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.ub.uu.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:GivenName>Tommy Hellberg</md:GivenName>
     <md:EmailAddress>mailto:tommy.hellberg@ub.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
+  </md:ContactPerson><md:ContactPerson contactType="support">
     <md:GivenName>Helpdesk</md:GivenName>
     <md:EmailAddress>mailto:helpdesk@ub.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/dnt.crc.med.lu.se-shibboleth.xml b/swamid-2.0/dnt.crc.med.lu.se-shibboleth.xml
index 5f6249fd..61bd58d1 100644
--- a/swamid-2.0/dnt.crc.med.lu.se-shibboleth.xml
+++ b/swamid-2.0/dnt.crc.med.lu.se-shibboleth.xml
@@ -93,9 +93,9 @@ nM/QX+BEspFf3+z68UOv6Boy1MYLCivGrb7XBYKIipEY0TmR
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dnt.crc.med.lu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dnt.crc.med.lu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>Mattias</md:GivenName>
     <md:SurName>Borell</md:SurName>
     <md:EmailAddress>mailto:mattias.borell@med.lu.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/durin.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/durin.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index d40833b1..ccb9e9f1 100644
--- a/swamid-2.0/durin.sau.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/durin.sau.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://durin.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://durin.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: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/e5.onthehub.com.xml b/swamid-2.0/e5.onthehub.com.xml
index 059daf10..00c3585b 100644
--- a/swamid-2.0/e5.onthehub.com.xml
+++ b/swamid-2.0/e5.onthehub.com.xml
@@ -88,17 +88,17 @@ tsXRh8I9G2b+om6fhCjEUmM=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SAML2/POST" index="10"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://e5.onthehub.com/WebStore/Security/Shibboleth/SWAMID/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">e-academy,Inc</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">e-academy</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.e-academy.com</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:GivenName>Shibboleth Technical Team</md:GivenName>
     <md:EmailAddress>mailto:Shibboleth@e-academy.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
+  </md:ContactPerson><md:ContactPerson contactType="administrative">
     <md:GivenName>Shibboleth Administration Team</md:GivenName>
     <md:EmailAddress>mailto:Shibboleth@e-academy.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/elegitimation2.inloggning.se-simplesaml-module.php-saml-sp-metadata.php-frontwalkersp.xml b/swamid-2.0/elegitimation2.inloggning.se-simplesaml-module.php-saml-sp-metadata.php-frontwalkersp.xml
index 20cad86e..e961fe9d 100644
--- a/swamid-2.0/elegitimation2.inloggning.se-simplesaml-module.php-saml-sp-metadata.php-frontwalkersp.xml
+++ b/swamid-2.0/elegitimation2.inloggning.se-simplesaml-module.php-saml-sp-metadata.php-frontwalkersp.xml
@@ -35,14 +35,14 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://elegitimation2.inloggning.se/simplesaml/module.php/saml/sp/saml2-acs.php/frontwalkersp" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://elegitimation2.inloggning.se/simplesaml/module.php/saml/sp/saml1-acs.php/frontwalkersp/artifact" index="3"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="sv">Retendo</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Retendo</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.e-identitet.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:GivenName>Mikael</md:GivenName>
     <md:SurName>Westoo</md:SurName>
     <md:EmailAddress>mailto:mikael.westoo@e-identitet.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/ensky.lhs.se-shibboleth.xml b/swamid-2.0/ensky.lhs.se-shibboleth.xml
index e2b5a0b0..e208ab38 100644
--- a/swamid-2.0/ensky.lhs.se-shibboleth.xml
+++ b/swamid-2.0/ensky.lhs.se-shibboleth.xml
@@ -15,14 +15,14 @@
     </KeyDescriptor>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ensky.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">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>
     <SurName>Helpdesk</SurName>
     <EmailAddress>mailto:helpdesk@it.su.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/exitpoll.jbtst.srv.lu.se-shibboleth.xml b/swamid-2.0/exitpoll.jbtst.srv.lu.se-shibboleth.xml
index 7e6c58d5..45688fbf 100644
--- a/swamid-2.0/exitpoll.jbtst.srv.lu.se-shibboleth.xml
+++ b/swamid-2.0/exitpoll.jbtst.srv.lu.se-shibboleth.xml
@@ -87,22 +87,22 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://exitpoll.jbtst.srv.lu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://exitpoll.jbtst.srv.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@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:servicedesk@lu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/fidus-test.skolverket.se-sp.xml b/swamid-2.0/fidus-test.skolverket.se-sp.xml
index 79deb400..af68544d 100644
--- a/swamid-2.0/fidus-test.skolverket.se-sp.xml
+++ b/swamid-2.0/fidus-test.skolverket.se-sp.xml
@@ -90,17 +90,17 @@ Q/e+DgEBGep0+PhFu8/GWnDWM7AQtnged7eNW6zUX5uyhQ==
     <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fidus-test.skolverket.se/Saml2SP/acs/post" index="1"/>
     <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fidus-test.skolverket.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">Skolverket</ns0:OrganizationName>
     <ns0:OrganizationDisplayName xml:lang="en">Skolverket</ns0:OrganizationDisplayName>
     <ns0:OrganizationURL xml:lang="en">https://www.skolverket.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:daniel.robles@skolverket.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:daniel.robles@skolverket.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
-</md:EntityDescriptor>
+  </ns0: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/flax.nettst.chalmers.se-adfs-services-trust.xml b/swamid-2.0/flax.nettst.chalmers.se-adfs-services-trust.xml
index a0601f5e..05a7cfc9 100644
--- a/swamid-2.0/flax.nettst.chalmers.se-adfs-services-trust.xml
+++ b/swamid-2.0/flax.nettst.chalmers.se-adfs-services-trust.xml
@@ -41,21 +41,21 @@
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://flax.nettst.chalmers.se/adfs/ls/"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://flax.nettst.chalmers.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="en">CHALMERSTest</OrganizationName>
     <OrganizationDisplayName xml:lang="en">Chalmers Test IdP</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.chalmers.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>Chalmers</Company>
     <EmailAddress>mailto:appro@chalmers.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>Chalmers</Company>
     <EmailAddress>mailto:nrq@chalmers.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>Chalmers</Company>
     <EmailAddress>mailto:biorn@chalmers.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/fs.liu.se-adfs-services-trust.xml b/swamid-2.0/fs.liu.se-adfs-services-trust.xml
index 4117f21d..3e2531c5 100644
--- a/swamid-2.0/fs.liu.se-adfs-services-trust.xml
+++ b/swamid-2.0/fs.liu.se-adfs-services-trust.xml
@@ -171,33 +171,33 @@ uR2IR/P9sJcaFTLtfYyZ1cTyC2eWviV+UCGwfW17U5WB23E3+NVGGpNKIfBukRYa
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.liu.se/adfs/ls/"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.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>
     <OrganizationName xml:lang="en">Linköping University</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Linköpings universitet</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Linköping University</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv">http://www.liu.se/</OrganizationURL>
     <OrganizationURL xml:lang="en">http://www.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: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>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/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/graylog.nordu.net-shibboleth.xml b/swamid-2.0/graylog.nordu.net-shibboleth.xml
index 83c34f4f..28289257 100644
--- a/swamid-2.0/graylog.nordu.net-shibboleth.xml
+++ b/swamid-2.0/graylog.nordu.net-shibboleth.xml
@@ -84,19 +84,19 @@ pc0/wSWsXlCKKdvcilYf9uc4RGpsdIHYHlCIBveUNMaqK3Ce2niYAgSGVH3vejoq
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://graylog.nordu.net/Shibboleth.sso/SAML/POST" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://graylog.nordu.net/Shibboleth.sso/SAML/Artifact" index="5"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="support">
+  
+  
+  
+<md:ContactPerson contactType="support">
     <md:GivenName>Sunet</md:GivenName>
     <md:SurName>NOC</md:SurName>
     <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><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:ContactPerson contactType="administrative">
+  </md:ContactPerson><md:ContactPerson contactType="administrative">
     <md:GivenName>Fredrik</md:GivenName>
     <md:SurName>Pettai</md:SurName>
     <md:EmailAddress>mailto:pettai@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/graylog.sunet.se-shibboleth.xml b/swamid-2.0/graylog.sunet.se-shibboleth.xml
index 463ac56d..63768bc3 100644
--- a/swamid-2.0/graylog.sunet.se-shibboleth.xml
+++ b/swamid-2.0/graylog.sunet.se-shibboleth.xml
@@ -87,9 +87,9 @@ x642c5iHKr2d/SOMA05pL7Qz4RB2fDIgmPg6VzglrkKBYVHUIi3a1j5dBA==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://graylog.sunet.se/Shibboleth.sso/SAML/POST" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://graylog.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@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/hb.hr.evry.se-shibboleth.xml b/swamid-2.0/hb.hr.evry.se-shibboleth.xml
index a4907aa0..71526b75 100644
--- a/swamid-2.0/hb.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/hb.hr.evry.se-shibboleth.xml
@@ -68,14 +68,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/hh.hr.evry.se-shibboleth.xml b/swamid-2.0/hh.hr.evry.se-shibboleth.xml
index fa89fc3f..d83e548e 100644
--- a/swamid-2.0/hh.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/hh.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/hhs-personality-quiz.eu-gb.mybluemix.net.xml b/swamid-2.0/hhs-personality-quiz.eu-gb.mybluemix.net.xml
index c7d10296..7ad63f85 100644
--- a/swamid-2.0/hhs-personality-quiz.eu-gb.mybluemix.net.xml
+++ b/swamid-2.0/hhs-personality-quiz.eu-gb.mybluemix.net.xml
@@ -24,8 +24,8 @@
     <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://hhs-personality-quiz.eu-gb.mybluemix.net/login/callback" index="1"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>Adam Sawert</md:GivenName>
     <md:EmailAddress>mailto:adam.sawert@ibm.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/hhs-se.zoom.us.xml b/swamid-2.0/hhs-se.zoom.us.xml
index 19a0863d..a57a0240 100644
--- a/swamid-2.0/hhs-se.zoom.us.xml
+++ b/swamid-2.0/hhs-se.zoom.us.xml
@@ -103,8 +103,8 @@ qoBVRu5DVnqs1dZZiZdHqRt3Tt22k0sDdvtQWnVISyGVqqSzPxq8YrLDVTA380eaXiYDbxoO1SN+
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://hhs-se.zoom.us/saml/SSO" index="0" isDefault="true"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://hhs-se.zoom.us/saml/SSO" index="1"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:SurName>Gottfried Gemzell</md:SurName>
     <md:EmailAddress>mailto:Gottfried.Gemzell@hhs.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/his-se.zoom.us.xml b/swamid-2.0/his-se.zoom.us.xml
index db942c64..8769156b 100644
--- a/swamid-2.0/his-se.zoom.us.xml
+++ b/swamid-2.0/his-se.zoom.us.xml
@@ -52,8 +52,8 @@ kMpIITAqh9XwkMMbjOapCeNu6wfL/ywLEOskEvvxnEgP00VVk8S32kBKmNQGLPufut3obbI=</ds:X50
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://his-se.zoom.us/saml/SSO" index="0" isDefault="true"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://his-se.zoom.us/saml/SSO" index="1"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:SurName>Vyacheslav Lytvynenko</md:SurName>
     <md:EmailAddress>mailto:vyacheslav.lytvynenko@his.se</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/hkr.hr.evry.se-shibboleth.xml b/swamid-2.0/hkr.hr.evry.se-shibboleth.xml
index 3201d0ff..747597d6 100644
--- a/swamid-2.0/hkr.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/hkr.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/hkrplay.hkr.se.xml b/swamid-2.0/hkrplay.hkr.se.xml
index 2fb3d718..cee9f01f 100644
--- a/swamid-2.0/hkrplay.hkr.se.xml
+++ b/swamid-2.0/hkrplay.hkr.se.xml
@@ -40,14 +40,14 @@
     <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" Location="https://hkrplay.hkr.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">HKRplay</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">HKRplay</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://hkrplay.hkr.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/hr.liu.se-shibboleth.xml b/swamid-2.0/hr.liu.se-shibboleth.xml
index 1d0d2b0b..26bd9c12 100644
--- a/swamid-2.0/hr.liu.se-shibboleth.xml
+++ b/swamid-2.0/hr.liu.se-shibboleth.xml
@@ -70,7 +70,9 @@ Zgu8vav6NzPHTYy+UoBYKhwMNtFqIg==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://hr.liu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://hr.liu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">
         EVRY HR Solutions AB
       </md:OrganizationName>
@@ -80,9 +82,7 @@ Zgu8vav6NzPHTYy+UoBYKhwMNtFqIg==
     <md:OrganizationURL xml:lang="en">
         http://www.evry.se
       </md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:SurName>Primulasupport</md:SurName>
     <md:EmailAddress>mailto:primulasupport@evry.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/hr.su.se-shibboleth.xml b/swamid-2.0/hr.su.se-shibboleth.xml
index 85f9ae2b..f3e85dac 100644
--- a/swamid-2.0/hr.su.se-shibboleth.xml
+++ b/swamid-2.0/hr.su.se-shibboleth.xml
@@ -74,7 +74,9 @@ gwi5chzD+EG7sLZMZ+izxSBoFuMKIFfmz37zEafLh0z1YOBqLt20uxjw+ulMKLz4
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://hr.su.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://hr.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">
         EVRY HR Solutions AB
       </md:OrganizationName>
@@ -84,9 +86,7 @@ gwi5chzD+EG7sLZMZ+izxSBoFuMKIFfmz37zEafLh0z1YOBqLt20uxjw+ulMKLz4
     <md:OrganizationURL xml:lang="en">
         http://www.evry.se
       </md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:SurName>Primulasupport</md:SurName>
     <md:EmailAddress>mailto:primulasupport@evry.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/hvplay.hv.se.xml b/swamid-2.0/hvplay.hv.se.xml
index 84fe1e52..8437a294 100644
--- a/swamid-2.0/hvplay.hv.se.xml
+++ b/swamid-2.0/hvplay.hv.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://hvplay.hv.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">HV Play</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">HV Play</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://hvplay.hv.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/id.statenssc.se-adfs-services-trust.xml b/swamid-2.0/id.statenssc.se-adfs-services-trust.xml
index fbe1c960..49f561b3 100644
--- a/swamid-2.0/id.statenssc.se-adfs-services-trust.xml
+++ b/swamid-2.0/id.statenssc.se-adfs-services-trust.xml
@@ -51,26 +51,26 @@
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://id.statenssc.se/adfs/ls/" index="1"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.statenssc.se/adfs/ls/" index="2"/>
   </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">Statens Servicecenter</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Ekonomi- och lönetjänster för anställda på svenska myndigheter</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Accounting and payroll services for employees at Swedish authorities</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv">http://www.statenssc.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>Johan</GivenName>
     <SurName>Göthberg</SurName>
     <EmailAddress>mailto:johan.gothberg@statenssc.se</EmailAddress>
     <TelephoneNumber>0771456000</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">
     <SurName>Johan Larsson</SurName>
     <EmailAddress>mailto:johan.larsson@statenssc.se</EmailAddress>
     <TelephoneNumber>+46 10-456 03 10</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">
     <SurName>Lars Forsgren</SurName>
     <EmailAddress>mailto:lars.forsgren@tieto.com</EmailAddress>
     <TelephoneNumber>+46 10-481 01 97</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp-test.comanage.sunet.se-sp.xml b/swamid-2.0/idp-test.comanage.sunet.se-sp.xml
index 24108a63..927b01c8 100644
--- a/swamid-2.0/idp-test.comanage.sunet.se-sp.xml
+++ b/swamid-2.0/idp-test.comanage.sunet.se-sp.xml
@@ -52,17 +52,17 @@ ygB2VM+8ymwkDfAm/TbcW1I6hFRKJKKJDqk/iuHN
     </KeyDescriptor>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.comanage.sunet.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/idp-test.it.su.se-idp-shibboleth.xml b/swamid-2.0/idp-test.it.su.se-idp-shibboleth.xml
index e271fedd..186f4e30 100644
--- a/swamid-2.0/idp-test.it.su.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp-test.it.su.se-idp-shibboleth.xml
@@ -60,28 +60,28 @@ UebM+vdVeYb0JLMqQevfKMQVbhC3sLuZEGHLh0VE/ZSY5GQGDAshuw0e7Xfrxcd6
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.it.su.se/idp/profile/SAML2/POST/SSO"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.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 (test)</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Stockholm University (test)</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>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp-test.nordu.net-idp-shibboleth.xml b/swamid-2.0/idp-test.nordu.net-idp-shibboleth.xml
index 6d499da3..6ca78187 100644
--- a/swamid-2.0/idp-test.nordu.net-idp-shibboleth.xml
+++ b/swamid-2.0/idp-test.nordu.net-idp-shibboleth.xml
@@ -89,14 +89,14 @@ X627IsSkKg==
     <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">NORDUnetTEST</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">NORDUnet Test IdP</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">NORDUnet Test IdP</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.nordu.net</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>NORDUnet NOC</Company>
     <EmailAddress>mailto:noc@nordu.net</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </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.nordu.net-simplesaml-saml2-idp-metadata.php.xml b/swamid-2.0/idp-test.nordu.net-simplesaml-saml2-idp-metadata.php.xml
index 4429f411..857944d7 100644
--- a/swamid-2.0/idp-test.nordu.net-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-2.0/idp-test.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://idp-test.nordu.net/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/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.konstfack.se-adfs-services-trust.xml b/swamid-2.0/idp-v2.konstfack.se-adfs-services-trust.xml
index cec9dae5..c80e3e41 100644
--- a/swamid-2.0/idp-v2.konstfack.se-adfs-services-trust.xml
+++ b/swamid-2.0/idp-v2.konstfack.se-adfs-services-trust.xml
@@ -55,18 +55,18 @@
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-v2.konstfack.se/adfs/ls/"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-v2.konstfack.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">Konstfack</OrganizationName>
     <OrganizationName xml:lang="en">Konstfack</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Konstfack</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Konstfack</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv">http://www.konstfack.se/</OrganizationURL>
     <OrganizationURL xml:lang="en">http://www.konstfack.se/en</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>Håkan</GivenName>
     <SurName>Pettersson</SurName>
     <EmailAddress>mailto:netsupport@konstfack.se</EmailAddress>
     <TelephoneNumber>+46-8-4504100</TelephoneNumber>
-  </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.antagning.se-aws-idp.xml b/swamid-2.0/idp.antagning.se-aws-idp.xml
index c5b8e715..2571d026 100644
--- a/swamid-2.0/idp.antagning.se-aws-idp.xml
+++ b/swamid-2.0/idp.antagning.se-aws-idp.xml
@@ -52,28 +52,28 @@ MIICBDCCAW2gAwIBAgIJANzswMCdTsm7MA0GCSqGSIb3DQEBCwUAMBsxGTAXBgNVBAMMEGlkcC5hbnRh
     <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">UHR</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">www.antagning.se</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">www.universityadmissions.se</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>Universityadmissions.se</Company>
     <SurName>UHR Systemdrift</SurName>
     <EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
     <TelephoneNumber>+46 10 470 06 28</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>Universityadmissions.se</Company>
     <SurName>Håkan Pettersson</SurName>
     <EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
     <TelephoneNumber>+46 10 470 06 28</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>Universityadmissions.se</Company>
     <SurName>UHR Systemdrift</SurName>
     <EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
     <TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp.chalmers.se-adfs-services-trust.xml b/swamid-2.0/idp.chalmers.se-adfs-services-trust.xml
index 68e54529..3a02446f 100644
--- a/swamid-2.0/idp.chalmers.se-adfs-services-trust.xml
+++ b/swamid-2.0/idp.chalmers.se-adfs-services-trust.xml
@@ -56,30 +56,30 @@
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.chalmers.se/adfs/ls/"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.chalmers.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="en">CHALMERS</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Chalmers</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Chalmers</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.chalmers.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">
     <SurName>Niklas</SurName>
     <EmailAddress>mailto:nrq@chalmers.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>Chalmers</Company>
     <SurName>Björn</SurName>
     <EmailAddress>mailto:biorn@chalmers.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>Chalmers</Company>
     <SurName>IT-support</SurName>
     <EmailAddress>mailto:support@chalmers.se</EmailAddress>
     <TelephoneNumber>+46 31 772 6000</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>Chalmers Incident Response Team</GivenName>
     <EmailAddress>mailto:abuse@chalmers.se</EmailAddress>
     <TelephoneNumber>+46 31 772 8450</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp.comanage.sunet.se-idp.xml b/swamid-2.0/idp.comanage.sunet.se-idp.xml
index ff64d23b..ce604774 100644
--- a/swamid-2.0/idp.comanage.sunet.se-idp.xml
+++ b/swamid-2.0/idp.comanage.sunet.se-idp.xml
@@ -55,17 +55,17 @@ HJbyRQeO5J/RKe2busGducxQo6/KccmF
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.comanage.sunet.se/Saml2SP/SUNET-TEST/sso/redirect"/>
     <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.comanage.sunet.se/Saml2SP/SUNET-TEST/sso/post"/>
   </md:IDPSSODescriptor>
-  <md:Organization>
+  
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">SUNET Test IdP</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">SUNET Test IdP</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.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/idp.comanage.sunet.se-sp.xml b/swamid-2.0/idp.comanage.sunet.se-sp.xml
index 8e0242df..40753dc6 100644
--- a/swamid-2.0/idp.comanage.sunet.se-sp.xml
+++ b/swamid-2.0/idp.comanage.sunet.se-sp.xml
@@ -53,17 +53,17 @@ HJbyRQeO5J/RKe2busGducxQo6/KccmF
     </KeyDescriptor>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.comanage.sunet.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/idp.dev.eduid.se-idp.xml.xml b/swamid-2.0/idp.dev.eduid.se-idp.xml.xml
index 285ed3f3..a677e466 100644
--- a/swamid-2.0/idp.dev.eduid.se-idp.xml.xml
+++ b/swamid-2.0/idp.dev.eduid.se-idp.xml.xml
@@ -83,18 +83,18 @@ hJCVd8ooEGRINTG+TBMufZC9UxoIdxjQRwrevhXTQAkfWT2+
     <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dev.eduid.se/sso/post"/>
     <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp.dev.eduid.se/sso/art"/>
   </ns0:IDPSSODescriptor>
-  <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">eduID DEV TEST</ns0:OrganizationName>
     <ns0:OrganizationDisplayName xml:lang="en">eduID DEV TEST</ns0:OrganizationDisplayName>
     <ns0:OrganizationURL xml:lang="en">http://www.eduid.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>eduID</ns0:GivenName>
     <ns0:SurName>developers</ns0:SurName>
     <ns0:EmailAddress>mailto:eduid-dev@SEGATE.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:support@eduid.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
-</md:EntityDescriptor>
+  </ns0: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.hkr.se-idp-shibboleth.xml b/swamid-2.0/idp.hkr.se-idp-shibboleth.xml
index 1a4548e6..31285318 100644
--- a/swamid-2.0/idp.hkr.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.hkr.se-idp-shibboleth.xml
@@ -107,29 +107,29 @@ kgLpO4NuqQRRqV5FxbnmTvt25NApGY5k
     <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">HKR</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Högskolan Kristianstad</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Kristianstad University Sweden</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv">http://www.hkr.se</OrganizationURL>
     <OrganizationURL xml:lang="en">http://www.hkr.se/en/english-start-page/</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>Högskolan Kristianstad</Company>
     <SurName>Service desk 3030</SurName>
     <EmailAddress>mailto:3030@hkr.se</EmailAddress>
     <TelephoneNumber>+46 44 20 3030</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>Högskolan Kristianstad</Company>
     <SurName>Service desk 3030</SurName>
     <EmailAddress>mailto:3030@hkr.se</EmailAddress>
     <TelephoneNumber>+46 44 20 3030</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>Högskolan Kristianstad</Company>
     <SurName>Service desk 3030</SurName>
     <EmailAddress>mailto:3030@hkr.se</EmailAddress>
     <TelephoneNumber>+46 44 20 3030</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp.hv.se-idp-shibboleth.xml b/swamid-2.0/idp.hv.se-idp-shibboleth.xml
index 1b7c58ea..5a7a8705 100644
--- a/swamid-2.0/idp.hv.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.hv.se-idp-shibboleth.xml
@@ -194,30 +194,30 @@ UPUl28rgefbQLT1QQewXqiTPqg==
     </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hv.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="sv">HV</OrganizationName>
     <OrganizationName xml:lang="en">HV</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Högskolan Väst</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">University West</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv">http://www.hv.se</OrganizationURL>
     <OrganizationURL xml:lang="en">http://www.hv.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 West</Company>
     <SurName>Magnus Andersson</SurName>
     <EmailAddress>mailto:Magnus.Andersson@hv.se</EmailAddress>
     <TelephoneNumber>+46 520 223193</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 West</Company>
     <SurName>Christian Jiresjö</SurName>
     <EmailAddress>mailto:Christian.Jiresjo@hv.se</EmailAddress>
     <TelephoneNumber>+46 520 223189</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 West</Company>
     <SurName>Servicedesk Högkoslan Väst</SurName>
     <EmailAddress>mailto:servicedesk@hv.se</EmailAddress>
     <TelephoneNumber>+46 520 223300</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.kmh.se-idp-shibboleth.xml b/swamid-2.0/idp.kmh.se-idp-shibboleth.xml
index c6f1f05a..b725498b 100644
--- a/swamid-2.0/idp.kmh.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.kmh.se-idp-shibboleth.xml
@@ -95,26 +95,26 @@ SqYks9bV+ae2Fl2AyXQXVv2GR6FNF8Y=</ds:X509Certificate>
     <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">KMH</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Kungliga Musikhögskolan i Stockholm</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Royal College of Music in Stockholm</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.kmh.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>Royal College of Music</Company>
     <SurName>KMH IT-avdelningen</SurName>
     <EmailAddress>mailto:swamid@kmh.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>Royal College of Music</Company>
     <SurName>KMH IT-avdelningen</SurName>
     <EmailAddress>mailto:swamid@kmh.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>Royal College of Music</Company>
     <SurName>KMH IT HelpDesk</SurName>
     <EmailAddress>mailto:helpdesk@kmh.se</EmailAddress>
     <TelephoneNumber>+46 8 161939</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.lnu.se-idp-shibboleth.xml b/swamid-2.0/idp.lnu.se-idp-shibboleth.xml
index b2954c31..bd9b31da 100644
--- a/swamid-2.0/idp.lnu.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.lnu.se-idp-shibboleth.xml
@@ -104,14 +104,14 @@
     <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">LNU</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Linnéuniversitetet</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Linnaeus University</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">https://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.ltu.se-idp-shibboleth.xml b/swamid-2.0/idp.ltu.se-idp-shibboleth.xml
index b3e98906..e3de32bb 100644
--- a/swamid-2.0/idp.ltu.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.ltu.se-idp-shibboleth.xml
@@ -192,28 +192,28 @@ ZdLXjuEF1cFQB3AAK9PIEmkLc69IXjPQ
     </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ltu.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">LTU</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Luleå tekniska universitet</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Lulea University of Technology</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.ltu.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>Lulea University of Technology</Company>
     <SurName>LTU Servicedesk</SurName>
     <EmailAddress>mailto:its-idp@list.ltu.se</EmailAddress>
     <TelephoneNumber>+46 920 491664</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>Lulea University of Technology</Company>
     <SurName>LTU Servicedesk</SurName>
     <EmailAddress>mailto:its-idp@list.ltu.se</EmailAddress>
     <TelephoneNumber>+46 920 491664</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>Lulea University of Technology</Company>
     <SurName>LTU Servicedesk</SurName>
     <EmailAddress>mailto:its-idp@list.ltu.se</EmailAddress>
     <TelephoneNumber>+46 920 491664</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp.mah.se-idp-shibboleth.xml b/swamid-2.0/idp.mah.se-idp-shibboleth.xml
index 3ff6c3f6..6fcfbe8d 100644
--- a/swamid-2.0/idp.mah.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.mah.se-idp-shibboleth.xml
@@ -200,28 +200,28 @@ Sb3rBCm5iyTFace5tFk069wtFHASk2Xy8atTMLx0nbFkq5eE/DVRsYj+C7QZOLTf
     </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mah.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">MAH</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Malmö universitet</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Malmö University</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">https://www.mau.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>Malmö University</Company>
     <SurName>IT Drift</SurName>
     <EmailAddress>mailto:drift@mau.se</EmailAddress>
     <TelephoneNumber>+46 709 655480</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>Malmö University</Company>
     <SurName>IT Drift</SurName>
     <EmailAddress>mailto:drift@mau.se</EmailAddress>
     <TelephoneNumber>+46 709 655480</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>Malmö University</Company>
     <SurName>IT Servicedesk</SurName>
     <EmailAddress>mailto:support@mau.se</EmailAddress>
     <TelephoneNumber>+46 40 6657555</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.nordu.net-idp-shibboleth.xml b/swamid-2.0/idp.nordu.net-idp-shibboleth.xml
index e3a698bd..588903f4 100644
--- a/swamid-2.0/idp.nordu.net-idp-shibboleth.xml
+++ b/swamid-2.0/idp.nordu.net-idp-shibboleth.xml
@@ -91,24 +91,24 @@ JiNCTXH29oP8kWBEBVaDxrDIrfDv53VjURS+KXqpBLjsuVE=
     <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">NORDUnet</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">NORDUnet</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">NORDUnet</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.nordu.net</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>NORDUnet</Company>
     <SurName>noc@nordu.net</SurName>
     <EmailAddress>mailto:noc@nordu.net</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>NORDUnet</Company>
     <EmailAddress>mailto:noc@nordu.net</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>NORDUnet</Company>
     <SurName>NUNOC</SurName>
     <EmailAddress>mailto:noc@nordu.net</EmailAddress>
-  </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.sunet.se-idp.xml b/swamid-2.0/idp.sunet.se-idp.xml
index 8d9bab67..e288576d 100644
--- a/swamid-2.0/idp.sunet.se-idp.xml
+++ b/swamid-2.0/idp.sunet.se-idp.xml
@@ -72,17 +72,17 @@ jiN2PVb/fS119Yu9s/jk86TcHIATZtmc/h6y5FkHzADUHGPPNum92l027dPIVqeT
     <saml:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sunet.se/Saml2SP/sso/redirect"/>
     <saml:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sunet.se/Saml2SP/sso/post"/>
   </saml:IDPSSODescriptor>
-  <saml:Organization xmlns:saml="urn:oasis:names:tc:SAML:2.0:metadata">
+  
+  
+  
+<saml:Organization xmlns:saml="urn:oasis:names:tc:SAML:2.0:metadata">
     <saml:OrganizationName xml:lang="en">SUNET</saml:OrganizationName>
     <saml:OrganizationDisplayName xml:lang="en">SUNET</saml:OrganizationDisplayName>
     <saml:OrganizationURL xml:lang="en">https://sunet.se</saml:OrganizationURL>
-  </saml:Organization>
-  <saml:ContactPerson xmlns:saml="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </saml:Organization><saml:ContactPerson xmlns:saml="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <saml:GivenName>Technical</saml:GivenName>
     <saml:EmailAddress>mailto:noc@sunet.se</saml:EmailAddress>
-  </saml:ContactPerson>
-  <saml:ContactPerson xmlns:saml="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
+  </saml:ContactPerson><saml:ContactPerson xmlns:saml="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
     <saml:GivenName>Support</saml:GivenName>
     <saml:EmailAddress>mailto:noc@sunet.se</saml:EmailAddress>
-  </saml:ContactPerson>
-</md:EntityDescriptor>
+  </saml:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp.test.antagning.se-aws-idp.xml b/swamid-2.0/idp.test.antagning.se-aws-idp.xml
index 4583425a..15e145d3 100644
--- a/swamid-2.0/idp.test.antagning.se-aws-idp.xml
+++ b/swamid-2.0/idp.test.antagning.se-aws-idp.xml
@@ -53,28 +53,28 @@ MIIDEzCCAfugAwIBAgIJAISr5vVr4OFKMA0GCSqGSIb3DQEBCwUAMCAxHjAcBgNVBAMMFWlkcC50ZXN0
     <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">UHR</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Antagning.se - Test</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Universityadmissions.se - Test</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>Universityadmissions.se</Company>
     <SurName>UHR Systemdrift</SurName>
     <EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
     <TelephoneNumber>+46 10 470 06 28</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>Universityadmissions.se</Company>
     <SurName>Håkan Pettersson</SurName>
     <EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
     <TelephoneNumber>+46 10 470 06 28</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>Universityadmissions.se</Company>
     <SurName>UHR Systemdrift</SurName>
     <EmailAddress>mailto:appldrift_saml@uhr.se</EmailAddress>
     <TelephoneNumber>+46 10 470 06 28</TelephoneNumber>
-  </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 ed5c4de4..f40fcb44 100644
--- a/swamid-2.0/idp.ths.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.ths.se-idp-shibboleth.xml
@@ -182,21 +182,21 @@ 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>Peter</GivenName>
     <SurName>Säll</SurName>
     <EmailAddress>mailto:peter@jhsupport.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/idp01.gih.se-idp-shibboleth.xml b/swamid-2.0/idp01.gih.se-idp-shibboleth.xml
index 94f822ff..59f5c97b 100644
--- a/swamid-2.0/idp01.gih.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp01.gih.se-idp-shibboleth.xml
@@ -196,28 +196,28 @@ MEsSqGHVIFzyCxPzfTl7HEhnSzXaKE07ShUemr6eig==
     </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp01.gih.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">The Swedish School of sport and health sciences</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Gymnastik- och idrottshögskolan</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">The Swedish School of Sport and Health Sciences</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.gih.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 School of Sport and Health Sciences</Company>
     <SurName>Fredrik Nilsson</SurName>
     <EmailAddress>mailto:fredrik.nilsson@gih.se</EmailAddress>
     <TelephoneNumber>+46 8 12053734</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 Swedish School of Sport and Health Sciences</Company>
     <SurName>Michael Thunell</SurName>
     <EmailAddress>mailto:michael.thunell@gih.se</EmailAddress>
     <TelephoneNumber>+46 8 12053807</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 Swedish School of Sport and Health Sciences</Company>
     <SurName>Charlie Skog</SurName>
     <EmailAddress>mailto:charlie.skog@gih.se</EmailAddress>
     <TelephoneNumber>+46 8 12053792</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp02.gih.se-idp-shibboleth.xml b/swamid-2.0/idp02.gih.se-idp-shibboleth.xml
index 596d1f33..1da6acfb 100644
--- a/swamid-2.0/idp02.gih.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp02.gih.se-idp-shibboleth.xml
@@ -180,28 +180,28 @@ kfpzToDw7cwPkXGX3xVBCLSNhnhot3urMFbpFSDWig==
     </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp02.gih.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">The Swedish School of Sport and Health Sciences (Test)</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Gymnastik- och idrottshögskolan (Test)</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">The Swedish School of Sport and Health Sciences (Test)</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.gih.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 School of Sport and Health Sciences</Company>
     <SurName>Fredrik Nilsson</SurName>
     <EmailAddress>mailto:fredrik.nilsson@gih.se</EmailAddress>
     <TelephoneNumber>+46 8 12053734</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 Swedish School of Sport and Health Sciences</Company>
     <SurName>Michael Thunell</SurName>
     <EmailAddress>mailto:michael.thunell@gih.se</EmailAddress>
     <TelephoneNumber>+46 8 12053807</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 Swedish School of Sport and Health Sciences</Company>
     <SurName>Charlie Skog</SurName>
     <EmailAddress>mailto:charlie.skog@gih.se</EmailAddress>
     <TelephoneNumber>+46 8 12053792</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp1.artologik.net-adfs-services-trust.xml b/swamid-2.0/idp1.artologik.net-adfs-services-trust.xml
index 0d7d2852..eda53b22 100644
--- a/swamid-2.0/idp1.artologik.net-adfs-services-trust.xml
+++ b/swamid-2.0/idp1.artologik.net-adfs-services-trust.xml
@@ -46,16 +46,16 @@
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp1.artologik.net/adfs/ls/" index="1"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.artologik.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">
     <SurName>Helpdesk</SurName>
     <EmailAddress>mailto:helpdesk@artologik.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">
     <SurName>Info</SurName>
     <EmailAddress>mailto:info@artisan.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">
     <SurName>Hostmaster</SurName>
     <EmailAddress>mailto:hostmaster@artisan.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp2-1.slu.se-idp-shibboleth.xml b/swamid-2.0/idp2-1.slu.se-idp-shibboleth.xml
index 8660cbd3..6fb3bb9c 100644
--- a/swamid-2.0/idp2-1.slu.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp2-1.slu.se-idp-shibboleth.xml
@@ -93,28 +93,28 @@ o04ltBnMhQ==</ds:X509Certificate>
     <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">Swedish University of Agricultural Science</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Sveriges Lantbruksuniversitet</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Swedish University of Agricultural Science</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.slu.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>Swedish University of Agricultural Science</Company>
     <SurName>Bengt Norman</SurName>
     <EmailAddress>mailto:saml-admins@slu.se</EmailAddress>
     <TelephoneNumber>+46 90 786 81 22</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>Swedish University of Agricultural Science</Company>
     <SurName>Ivan Clegg</SurName>
     <EmailAddress>mailto:saml-admins@slu.se</EmailAddress>
     <TelephoneNumber>+46 70 2413737</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>Swedish University of Agricultural Science</Company>
     <SurName>IT-stöd</SurName>
     <EmailAddress>mailto:IT-stod@slu.se</EmailAddress>
     <TelephoneNumber>+46 18 67 66 00</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp2-test.slu.se-idp-shibboleth.xml b/swamid-2.0/idp2-test.slu.se-idp-shibboleth.xml
index 78440179..d086dcc7 100644
--- a/swamid-2.0/idp2-test.slu.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp2-test.slu.se-idp-shibboleth.xml
@@ -81,22 +81,22 @@ YDkKy11d6W9v8pPknySJoAC5hL1v26ov7NpY6LN+tNAhuSfMSKo1ugFmOfX/CAIc
     <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">Swedish University of Agricultural Science</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Sveriges Lantbruksuniversitet (test)</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Swedish University of Agricultural Science (test)</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.slu.se/en/</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>SAML Admins</GivenName>
     <EmailAddress>mailto:saml-admins@slu.se</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>SAML Admins</GivenName>
     <EmailAddress>mailto:saml-admins@slu.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>Help Desk</GivenName>
     <EmailAddress>mailto:IT-stod@slu.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </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.his.se-idp-shibboleth.xml b/swamid-2.0/idp2.his.se-idp-shibboleth.xml
index 9b8c698c..cf4c089e 100644
--- a/swamid-2.0/idp2.his.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp2.his.se-idp-shibboleth.xml
@@ -196,28 +196,28 @@ lydgJ83mLCTu9Bueh30Fp3aQ64DAHbCABkgW
     </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.his.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">HIS</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Högskolan i Skövde</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">University of Skövde</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.his.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 Skövde</Company>
     <SurName>HiS Netadmin</SurName>
     <EmailAddress>mailto:netadmin@his.se</EmailAddress>
     <TelephoneNumber>+46 500 448800</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 Skövde</Company>
     <SurName>HiS Netadmin</SurName>
     <EmailAddress>mailto:netadmin@his.se</EmailAddress>
     <TelephoneNumber>+46 500 448800</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 Skövde</Company>
     <SurName>IT Helpdesk Högskolan i Skövde</SurName>
     <EmailAddress>mailto:helpdesk@his.se</EmailAddress>
     <TelephoneNumber>+46 500 448800</TelephoneNumber>
-  </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/idp2.test.umu.se-saml2-idp-metadata.php.xml b/swamid-2.0/idp2.test.umu.se-saml2-idp-metadata.php.xml
index d68eacd3..8ae4a60e 100644
--- a/swamid-2.0/idp2.test.umu.se-saml2-idp-metadata.php.xml
+++ b/swamid-2.0/idp2.test.umu.se-saml2-idp-metadata.php.xml
@@ -35,16 +35,16 @@
     <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://idp2.test.umu.se/saml2/idp/SSOService.php"/>
   </md:IDPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">UmU</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">UmU</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Umeå University (New)</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Umeå universitet (Ny)</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.umu.se/english</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">http://www.umu.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:SurName>Datordrift</md:SurName>
     <md:EmailAddress>mailto:datordrift@umdac.umu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idp3.hig.se-idp-shibboleth.xml b/swamid-2.0/idp3.hig.se-idp-shibboleth.xml
index b33c221f..f1738749 100644
--- a/swamid-2.0/idp3.hig.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp3.hig.se-idp-shibboleth.xml
@@ -197,28 +197,28 @@ uSUv8QvuQcOa9kYsSNH4o1+qTVp8mrFCghss
     </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.hig.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">HIG</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Högskolan i Gävle</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">University of Gävle</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.hig.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 Gävle</Company>
     <SurName>Network Operations</SurName>
     <EmailAddress>mailto:nat@hig.se</EmailAddress>
     <TelephoneNumber>+46 26 648500</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 Gävle</Company>
     <SurName>Operations</SurName>
     <EmailAddress>mailto:nat@hig.se</EmailAddress>
     <TelephoneNumber>+46 26 648500</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 Gävle</Company>
     <SurName>IT Support</SurName>
     <EmailAddress>mailto:itsupport@hig.se</EmailAddress>
     <TelephoneNumber>+46 26 648500</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/idpshibboleth.irf.se-idp-shibboleth.xml b/swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml
index 2c7819e9..da063f73 100644
--- a/swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml
+++ b/swamid-2.0/idpshibboleth.irf.se-idp-shibboleth.xml
@@ -205,28 +205,28 @@ CQNfH97cIrTE5N/RQ7XWcw==
     </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idpshibboleth.irf.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">IRF</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Institutet för rymdfysik</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Swedish Institute of Space Physics</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.irf.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>Swedish Institute of Space Physics</Company>
     <SurName>Mats Luspa</SurName>
     <EmailAddress>mailto:datagruppen@irf.se</EmailAddress>
     <TelephoneNumber>+4698079000</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>Swedish Institute of Space Physics</Company>
     <SurName>Mats Luspa</SurName>
     <EmailAddress>mailto:datagruppen@irf.se</EmailAddress>
     <TelephoneNumber>+4698079022</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>Swedish Institute of Space Physics</Company>
     <SurName>Mats Luspa</SurName>
     <EmailAddress>mailto:datagruppen@irf.se</EmailAddress>
     <TelephoneNumber>+4698079022</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idpsimplesaml.irf.se-simplesaml-saml2-idp-metadata.php.xml b/swamid-2.0/idpsimplesaml.irf.se-simplesaml-saml2-idp-metadata.php.xml
index e47a7fff..fadab913 100644
--- a/swamid-2.0/idpsimplesaml.irf.se-simplesaml-saml2-idp-metadata.php.xml
+++ b/swamid-2.0/idpsimplesaml.irf.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://idpsimplesaml.irf.se/simplesaml/saml2/idp/SSOService.php"/>
   </md:IDPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>Mats</md:GivenName>
     <md:SurName>Luspa</md:SurName>
     <md:EmailAddress>mailto:matsl@irf.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/idpv3.lu.se-idp-shibboleth.xml b/swamid-2.0/idpv3.lu.se-idp-shibboleth.xml
index 605865ae..9210155b 100644
--- a/swamid-2.0/idpv3.lu.se-idp-shibboleth.xml
+++ b/swamid-2.0/idpv3.lu.se-idp-shibboleth.xml
@@ -127,29 +127,29 @@ KE7aiSxYsHeCrgDI13bWgb/5xaYBMwJLDYj/KTIrtThku/WU8kDgEZtjcfCWCMiJ
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idpv3.lu.se/idp/profile/SAML2/POST/SSO"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpv3.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</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Lund University</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://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/imogen.surfnet.nl-proxy-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/imogen.surfnet.nl-proxy-module.php-saml-sp-metadata.php-default-sp.xml
index 90559445..8dd308c2 100644
--- a/swamid-2.0/imogen.surfnet.nl-proxy-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/imogen.surfnet.nl-proxy-module.php-saml-sp-metadata.php-default-sp.xml
@@ -31,9 +31,9 @@
       <md:RequestedAttribute 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="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>Bas</md:GivenName>
     <md:SurName>Zoetekouw</md:SurName>
     <md:EmailAddress>mailto:bas.zoetekouw@surfnet.nl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/inacademia.org-metadata-inacademia-simple-validation.xml.xml b/swamid-2.0/inacademia.org-metadata-inacademia-simple-validation.xml.xml
index 12f8f859..f8997d2b 100644
--- a/swamid-2.0/inacademia.org-metadata-inacademia-simple-validation.xml.xml
+++ b/swamid-2.0/inacademia.org-metadata-inacademia-simple-validation.xml.xml
@@ -108,24 +108,24 @@
       <md: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" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">InAcademia operated by GÉANT</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">InAcademia</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://inacademia.org/about</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
+  </md:Organization><md:ContactPerson contactType="support">
     <md:GivenName>InAcademia</md:GivenName>
     <md:SurName>Enduser Support</md:SurName>
     <md:EmailAddress>mailto:support@inacademia.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
+  </md:ContactPerson><md:ContactPerson contactType="administrative">
     <md:GivenName>InAcademia</md:GivenName>
     <md:SurName>Administrative Support</md:SurName>
     <md:EmailAddress>mailto:admin@inacademia.org</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:GivenName>InAcademia</md:GivenName>
     <md:SurName>Technical Support</md:SurName>
     <md:EmailAddress>mailto:tech@inacademia.org</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/indico.test.uu.se-shibboleth.xml b/swamid-2.0/indico.test.uu.se-shibboleth.xml
index fc1c606f..b5964456 100644
--- a/swamid-2.0/indico.test.uu.se-shibboleth.xml
+++ b/swamid-2.0/indico.test.uu.se-shibboleth.xml
@@ -103,21 +103,21 @@ acjhlnJDt40YvXKkX07QZm3Ti5EjNpo4xpmj7+U=
       <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: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="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:Company>Uppsala universitet</md:Company>
     <md:EmailAddress>mailto:drift@uadm.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/indico.uu.se-shibboleth.xml b/swamid-2.0/indico.uu.se-shibboleth.xml
index aa027932..2bd60e45 100644
--- a/swamid-2.0/indico.uu.se-shibboleth.xml
+++ b/swamid-2.0/indico.uu.se-shibboleth.xml
@@ -107,23 +107,23 @@ S8+ySBPOBAlDD/+hnhDiWa82S9gWdmu9m9eFNZhK65BrqXq6ogD9wpznTB/+AbQ=
       <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: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="administrative">
+  </md:Organization><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/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/irf.hr.evry.se-shibboleth.xml b/swamid-2.0/irf.hr.evry.se-shibboleth.xml
index 51f4956f..7bc1e329 100644
--- a/swamid-2.0/irf.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/irf.hr.evry.se-shibboleth.xml
@@ -68,14 +68,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/irttools.nordu.net-shibboleth.xml b/swamid-2.0/irttools.nordu.net-shibboleth.xml
index 3dfd8a1c..7f358547 100644
--- a/swamid-2.0/irttools.nordu.net-shibboleth.xml
+++ b/swamid-2.0/irttools.nordu.net-shibboleth.xml
@@ -108,9 +108,9 @@ vg==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://misp.nordu.net/Shibboleth.sso/SAML/POST" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://misp.nordu.net/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@nordu.net</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/juridicum.blackboard.com-auth-saml-saml-SSO.xml b/swamid-2.0/juridicum.blackboard.com-auth-saml-saml-SSO.xml
index 52603bd3..8b649670 100644
--- a/swamid-2.0/juridicum.blackboard.com-auth-saml-saml-SSO.xml
+++ b/swamid-2.0/juridicum.blackboard.com-auth-saml-saml-SSO.xml
@@ -70,25 +70,25 @@ PTppbqE=</ds:X509Certificate>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://juridicum.blackboard.com/auth-saml/saml/SSO" index="0" isDefault="true"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://juridicum.blackboard.com/auth-saml/saml/SSO" index="1"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">LU</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Lunds universitet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Lund University</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.lu.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
+  </md:Organization><md:ContactPerson contactType="administrative">
     <md:Company>Lund University</md:Company>
     <md:SurName>Stefan Bengtsson</md:SurName>
     <md:EmailAddress>mailto:stefan.bengtsson@jur.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:Company>Lund University</md:Company>
     <md:SurName>Stefan Bengtsson</md:SurName>
     <md:EmailAddress>mailto:stefan.bengtsson@jur.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
+  </md:ContactPerson><md:ContactPerson contactType="support">
     <md:Company>Lund University</md:Company>
     <md:SurName>Stefan Bengtsson</md:SurName>
     <md:EmailAddress>mailto:stefan.bengtsson@jur.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/kaltura.saas-idp-test.swamid.se-saml2-proxy_saml2_backend.xml b/swamid-2.0/kaltura.saas-idp-test.swamid.se-saml2-proxy_saml2_backend.xml
index aae8ba64..a5249d81 100644
--- a/swamid-2.0/kaltura.saas-idp-test.swamid.se-saml2-proxy_saml2_backend.xml
+++ b/swamid-2.0/kaltura.saas-idp-test.swamid.se-saml2-proxy_saml2_backend.xml
@@ -85,17 +85,17 @@ vwUCgOYar5qF3huByMQmNfVFXoU6UDElCkeX
     <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://saas-idp-test.swamid.se/Saml2/acs/post" index="1"/>
     <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://saas-idp-test.swamid.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">SUNET Play</ns0:OrganizationName>
     <ns0:OrganizationDisplayName xml:lang="en">SUNET Play</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>
diff --git a/swamid-2.0/kantarainitiative.org-confluence-plugins-servlet-samlsso.xml b/swamid-2.0/kantarainitiative.org-confluence-plugins-servlet-samlsso.xml
index 3f0a19c1..d68924a5 100644
--- a/swamid-2.0/kantarainitiative.org-confluence-plugins-servlet-samlsso.xml
+++ b/swamid-2.0/kantarainitiative.org-confluence-plugins-servlet-samlsso.xml
@@ -59,13 +59,13 @@ PMS4rjAWc41dsrr8CuH3t/NKbvDc9Rn6U+qLGttLcJ1Jlpw2i3fPGGJ+osSsX9+h3KUdLv9j7zJB
     <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://kantarainitiative.org/confluence/plugins/servlet/samlsso" index="0"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Kantara Initiative Inc</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Kantara Initiative Inc</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://kantarainitiative.org</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
+  </md:Organization><md:ContactPerson contactType="support">
     <md:SurName>Kantara Initiative</md:SurName>
     <md:EmailAddress>mailto:info@kantarainitiative.org</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/kau-se.zoom.us.xml b/swamid-2.0/kau-se.zoom.us.xml
index e54254b0..03d187b8 100644
--- a/swamid-2.0/kau-se.zoom.us.xml
+++ b/swamid-2.0/kau-se.zoom.us.xml
@@ -96,12 +96,12 @@ qoBVRu5DVnqs1dZZiZdHqRt3Tt22k0sDdvtQWnVISyGVqqSzPxq8YrLDVTA380eaXiYDbxoO1SN+
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://kau-se.zoom.us/saml/SSO" index="0" isDefault="true"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kau-se.zoom.us/saml/SSO" index="1"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="support">
+  
+  
+<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/kau.hr.evry.se-shibboleth.xml b/swamid-2.0/kau.hr.evry.se-shibboleth.xml
index 3e54f333..ff7f1f38 100644
--- a/swamid-2.0/kau.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/kau.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/kau.instructure.com-saml2.xml b/swamid-2.0/kau.instructure.com-saml2.xml
index 9630a081..dd2058d7 100644
--- a/swamid-2.0/kau.instructure.com-saml2.xml
+++ b/swamid-2.0/kau.instructure.com-saml2.xml
@@ -97,16 +97,16 @@ 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="support">
+  
+  
+  
+<md:ContactPerson contactType="support">
     <md:SurName>CANVAS Support</md:SurName>
     <md:EmailAddress>mailto:canvas@kau.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
+  </md:ContactPerson><md:ContactPerson contactType="administrative">
     <md:SurName>CANVAS Support</md:SurName>
     <md:EmailAddress>mailto:canvas@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/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/keybucket.app.nordu.net-saml2-sp-metadata.xml b/swamid-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml
index 22238a33..09e795e6 100644
--- a/swamid-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml
+++ b/swamid-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml
@@ -53,15 +53,15 @@ wXXiBDXS3PNHXQnnpys=
       <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" isRequired="true"/>
     </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:GivenName>Leif</md:GivenName>
     <md:SurName>Johansson</md:SurName>
     <md:EmailAddress>mailto:leifj@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/keystone.lab.cloud.ipnett.net-shibboleth.xml b/swamid-2.0/keystone.lab.cloud.ipnett.net-shibboleth.xml
index 6c2ddf9e..a24560ae 100644
--- a/swamid-2.0/keystone.lab.cloud.ipnett.net-shibboleth.xml
+++ b/swamid-2.0/keystone.lab.cloud.ipnett.net-shibboleth.xml
@@ -88,12 +88,12 @@
       <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:ContactPerson contactType="support">
+  
+  
+<md:ContactPerson contactType="support">
     <md:GivenName>Information Kirei</md:GivenName>
     <md:EmailAddress>mailto:info@kirei.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:GivenName>Jakob Schlyter</md:GivenName>
     <md:EmailAddress>mailto:jakob@kirei.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/ki.hr.evry.se-shibboleth.xml b/swamid-2.0/ki.hr.evry.se-shibboleth.xml
index f19b7d8c..fea7ab47 100644
--- a/swamid-2.0/ki.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/ki.hr.evry.se-shibboleth.xml
@@ -68,14 +68,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/kmh.hr.evry.se-shibboleth.xml b/swamid-2.0/kmh.hr.evry.se-shibboleth.xml
index 9b69560e..a2749820 100644
--- a/swamid-2.0/kmh.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/kmh.hr.evry.se-shibboleth.xml
@@ -68,14 +68,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/koha-test.lub.lu.se-shibboleth.xml b/swamid-2.0/koha-test.lub.lu.se-shibboleth.xml
index f232eee7..d955f781 100644
--- a/swamid-2.0/koha-test.lub.lu.se-shibboleth.xml
+++ b/swamid-2.0/koha-test.lub.lu.se-shibboleth.xml
@@ -95,21 +95,21 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://koha-test.lub.lu.se:8443/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://koha-test.lub.lu.se:8443/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">LU</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Lund University</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.lu.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
+  </md:Organization><md:ContactPerson contactType="administrative">
     <md:Company>Lund University</md:Company>
     <md:GivenName>Stina</md:GivenName>
     <md:SurName>Hallin</md:SurName>
     <md:EmailAddress>mailto:stina.hallin@ub.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:Company>Lund University</md:Company>
     <md:GivenName>David</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/konto-test.test.hb.se-shibboleth.xml b/swamid-2.0/konto-test.test.hb.se-shibboleth.xml
index 8e3a57a8..06b3b5ac 100644
--- a/swamid-2.0/konto-test.test.hb.se-shibboleth.xml
+++ b/swamid-2.0/konto-test.test.hb.se-shibboleth.xml
@@ -131,22 +131,22 @@ jdkRrWzWFJhSCRj04tS0Oyw=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://konto-test.test.hb.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://konto-test.test.hb.se/Shibboleth.sso/SAML2/ECP" index="4"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
+  
+  
+  
+<md:ContactPerson contactType="administrative">
     <md:Company>University of Borås</md:Company>
     <md:SurName>IT</md:SurName>
     <md:EmailAddress>mailto:campusservice@hb.se</md:EmailAddress>
     <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:Company>University of Borås</md:Company>
     <md:SurName>IT</md:SurName>
     <md:EmailAddress>mailto:campusservice@hb.se</md:EmailAddress>
     <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
+  </md:ContactPerson><md:ContactPerson contactType="support">
     <md:Company>University of Borås</md:Company>
     <md:SurName>IT</md:SurName>
     <md:EmailAddress>mailto:campusservice@hb.se</md:EmailAddress>
     <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/konto.bth.se-sp.xml b/swamid-2.0/konto.bth.se-sp.xml
index af73e365..7a5fca63 100644
--- a/swamid-2.0/konto.bth.se-sp.xml
+++ b/swamid-2.0/konto.bth.se-sp.xml
@@ -33,14 +33,14 @@
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://konto.bth.se/AuthServices/Acs" index="0" isDefault="true"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://konto.bth.se/AuthServices/Acs" index="1" isDefault="false"/>
   </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">BTH</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">BTH</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv">http://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">
     <GivenName>Björn</GivenName>
     <SurName>Mattsson</SurName>
     <EmailAddress>mailto:bjorn.mattsson@bth.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/konto.hb.se-shibboleth.xml b/swamid-2.0/konto.hb.se-shibboleth.xml
index 1a5dad12..0a7092ef 100644
--- a/swamid-2.0/konto.hb.se-shibboleth.xml
+++ b/swamid-2.0/konto.hb.se-shibboleth.xml
@@ -129,22 +129,22 @@ toA=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://konto.hb.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://konto.hb.se/Shibboleth.sso/SAML2/ECP" index="4"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
+  
+  
+  
+<md:ContactPerson contactType="administrative">
     <md:Company>University of Borås</md:Company>
     <md:SurName>IT</md:SurName>
     <md:EmailAddress>mailto:campusservice@hb.se</md:EmailAddress>
     <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:Company>University of Borås</md:Company>
     <md:SurName>IT</md:SurName>
     <md:EmailAddress>mailto:campusservice@hb.se</md:EmailAddress>
     <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
+  </md:ContactPerson><md:ContactPerson contactType="support">
     <md:Company>University of Borås</md:Company>
     <md:SurName>IT</md:SurName>
     <md:EmailAddress>mailto:campusservice@hb.se</md:EmailAddress>
     <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/konto.hig.se-443-idm.xml b/swamid-2.0/konto.hig.se-443-idm.xml
index 344bfdcf..e72f67d6 100644
--- a/swamid-2.0/konto.hig.se-443-idm.xml
+++ b/swamid-2.0/konto.hig.se-443-idm.xml
@@ -73,14 +73,14 @@ toK8L6pqaFCbNOcoCOFIF37SX7skdyefXRiYXwy8Ut7sS211qtLu8w==</ds:X509Certificate>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://konto.hig.se:443/idm/login/saml/SSO" index="0" isDefault="true"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://konto.hig.se:443/idm/login/saml/SSO" index="1"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
+  
+  
+<md:ContactPerson contactType="administrative">
     <md:GivenName>Mona</md:GivenName>
     <md:SurName>Åkerman</md:SurName>
     <md:EmailAddress>mailto:mona.akerman@hig.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:GivenName>Eetu</md:GivenName>
     <md:SurName>Heino</md:SurName>
     <md:EmailAddress>mailto:eetu.heino@efecte.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/konto.kau.se.xml b/swamid-2.0/konto.kau.se.xml
index 76b11a22..fe884f7a 100644
--- a/swamid-2.0/konto.kau.se.xml
+++ b/swamid-2.0/konto.kau.se.xml
@@ -66,18 +66,18 @@ SKJRa32Iq7xb1QIK+C+dIeHFEYkTxoDaS9p1cXELDcFihnfam/NCLN/E9tiJkos=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mfa-admin-test.kau.se/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://mfa-admin.kau.se/Shibboleth.sso/SAML2/POST" index="1"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Karlstads universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Karlstads universitet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.kau.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:GivenName>Webbteknik</md:GivenName>
     <md:SurName>IT-avdelningen</md:SurName>
     <md:EmailAddress>mailto:webbteknik@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: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/konto.weblogin.uu.se-shibboleth.xml b/swamid-2.0/konto.weblogin.uu.se-shibboleth.xml
index 140a4f67..284a5a14 100644
--- a/swamid-2.0/konto.weblogin.uu.se-shibboleth.xml
+++ b/swamid-2.0/konto.weblogin.uu.se-shibboleth.xml
@@ -59,17 +59,17 @@ zs343t8msFatMz3jlO+DgmZS0btlHkYSvRDAGaXOAkwGnE3nzjsLKA==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://konto.weblogin.uu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://konto.weblogin.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-00.ladok.umu.se-gui-sp.xml b/swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml
index e0b0ca9e..1d5775c0 100644
--- a/swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml
+++ b/swamid-2.0/ladok3-00.ladok.umu.se-gui-sp.xml
@@ -95,19 +95,19 @@ w5aKug==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-00.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-00.ladok.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/ladok3-00.ladok.umu.se-idp-shibboleth.xml b/swamid-2.0/ladok3-00.ladok.umu.se-idp-shibboleth.xml
index 72086f09..670de49d 100644
--- a/swamid-2.0/ladok3-00.ladok.umu.se-idp-shibboleth.xml
+++ b/swamid-2.0/ladok3-00.ladok.umu.se-idp-shibboleth.xml
@@ -197,19 +197,19 @@ QfQy1lyrNjxrtHbS9ZGNpgVlaNvNHWF4ENGIAuxBLO2IZ6TgLGdNtB0Cn3c+Xdti
     <!-- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ladok3-00.ladok.umu.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>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+  
+  
+  
+<ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>ITS, Umea universitet</Company>
     <SurName>Fredrik Domeij</SurName>
     <EmailAddress>mailto:fredrik.domeij@umu.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>ITS, Umea universitet</Company>
     <SurName>Fredrik Domeij</SurName>
     <EmailAddress>mailto:fredrik.domeij@umu.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>ITS, Umea universitet</Company>
     <SurName>Fredrik Domeij</SurName>
     <EmailAddress>mailto:fredrik.domeij@umu.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3-00.ladok.umu.se-student-sp.xml b/swamid-2.0/ladok3-00.ladok.umu.se-student-sp.xml
index 14dea062..aafc6db2 100644
--- a/swamid-2.0/ladok3-00.ladok.umu.se-student-sp.xml
+++ b/swamid-2.0/ladok3-00.ladok.umu.se-student-sp.xml
@@ -96,19 +96,19 @@ Xtg7VBxaqt1Fm/Me7/+LxiQ=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3-00.ladok.umu.se:446/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ladok3-00.ladok.umu.se:446/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/ladok3-jenkins-master.ladok.umu.se-securityrealm-finishlogin.xml b/swamid-2.0/ladok3-jenkins-master.ladok.umu.se-securityrealm-finishlogin.xml
index 12ea5c56..c96983dc 100644
--- a/swamid-2.0/ladok3-jenkins-master.ladok.umu.se-securityrealm-finishlogin.xml
+++ b/swamid-2.0/ladok3-jenkins-master.ladok.umu.se-securityrealm-finishlogin.xml
@@ -41,19 +41,19 @@
     <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-master.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-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-jenkins.ladok.umu.se-securityrealm-finishlogin.xml b/swamid-2.0/ladok3-jenkins.ladok.umu.se-securityrealm-finishlogin.xml
index 06a377ca..28fefe03 100644
--- a/swamid-2.0/ladok3-jenkins.ladok.umu.se-securityrealm-finishlogin.xml
+++ b/swamid-2.0/ladok3-jenkins.ladok.umu.se-securityrealm-finishlogin.xml
@@ -71,19 +71,19 @@ bYrcg39YS/2EWWrboSpMu2+agRG+NebnTpJzKirx/I1dZldnmvxN+j4ZhMoMZq+qZ4XK3kNY1q76
     <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.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>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/ladok3-processes.ladok.umu.se-securityrealm-finishlogin.xml b/swamid-2.0/ladok3-processes.ladok.umu.se-securityrealm-finishlogin.xml
index 0b68d794..b56ca800 100644
--- a/swamid-2.0/ladok3-processes.ladok.umu.se-securityrealm-finishlogin.xml
+++ b/swamid-2.0/ladok3-processes.ladok.umu.se-securityrealm-finishlogin.xml
@@ -82,19 +82,19 @@ N5PXNucNUWeBInrGL6LrbJdJ6Cwv5yk55oUNhcGpOGSPdiei0q8IFknj</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-processes.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>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/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/ladok3.its.umu.se-user-idp.xml b/swamid-2.0/ladok3.its.umu.se-user-idp.xml
index 232371f0..45f89310 100644
--- a/swamid-2.0/ladok3.its.umu.se-user-idp.xml
+++ b/swamid-2.0/ladok3.its.umu.se-user-idp.xml
@@ -45,19 +45,19 @@ MIIBgTCCASugAwIBAgIJAILqNDVSOCaoMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMMEWxhZG9rMy5p
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
   </AttributeAuthorityDescriptor>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+  
+  
+  
+<ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>ITS, Umea universitet</Company>
     <SurName>Fredrik Domeij</SurName>
     <EmailAddress>mailto:fredrik.domeij@umu.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>ITS, Umea universitet</Company>
     <SurName>Fredrik Domeij</SurName>
     <EmailAddress>mailto:fredrik.domeij@umu.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>ITS, Umea universitet</Company>
     <SurName>Fredrik Domeij</SurName>
     <EmailAddress>mailto:fredrik.domeij@umu.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/ladok3.ladok.umu.se-8443-jenkins-securityrealm-finishlogin.xml b/swamid-2.0/ladok3.ladok.umu.se-8443-jenkins-securityrealm-finishlogin.xml
index 807f22aa..e95a6a00 100644
--- a/swamid-2.0/ladok3.ladok.umu.se-8443-jenkins-securityrealm-finishlogin.xml
+++ b/swamid-2.0/ladok3.ladok.umu.se-8443-jenkins-securityrealm-finishlogin.xml
@@ -71,19 +71,19 @@ Zt9koo0LwqrO6JAc0XcB96E3f2td2FHdIzwOS/IbzLPX6lXA</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.ladok.umu.se:8443/jenkins/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/ladok3.ladok.umu.se-shibboleth.xml b/swamid-2.0/ladok3.ladok.umu.se-shibboleth.xml
index bd301002..f0e6413c 100644
--- a/swamid-2.0/ladok3.ladok.umu.se-shibboleth.xml
+++ b/swamid-2.0/ladok3.ladok.umu.se-shibboleth.xml
@@ -96,19 +96,19 @@ L8JKymQ3TDk/0a+t4y/ARC9bJ0ttOPY4K7WD21ddd0/xlz/AvA2g/f1Amlf0DC3T
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ladok3.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.ladok.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/ladok3test.its.umu.se-user-idp.xml b/swamid-2.0/ladok3test.its.umu.se-user-idp.xml
index eda8a59c..9d2929ab 100644
--- a/swamid-2.0/ladok3test.its.umu.se-user-idp.xml
+++ b/swamid-2.0/ladok3test.its.umu.se-user-idp.xml
@@ -45,19 +45,19 @@ MIIBiTCCATOgAwIBAgIJALdp5a/xlxT7MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNVBAMMFWxhZG9rM3Rl
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
   </AttributeAuthorityDescriptor>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+  
+  
+  
+<ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>ITS, Umea universitet</Company>
     <SurName>Fredrik Domeij</SurName>
     <EmailAddress>mailto:fredrik.domeij@umu.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>ITS, Umea universitet</Company>
     <SurName>Fredrik Domeij</SurName>
     <EmailAddress>mailto:fredrik.domeij@umu.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>ITS, Umea universitet</Company>
     <SurName>Fredrik Domeij</SurName>
     <EmailAddress>mailto:fredrik.domeij@umu.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/lap559t.bmc.lu.se-shibboleth.xml b/swamid-2.0/lap559t.bmc.lu.se-shibboleth.xml
index b4bc1b05..573afc25 100644
--- a/swamid-2.0/lap559t.bmc.lu.se-shibboleth.xml
+++ b/swamid-2.0/lap559t.bmc.lu.se-shibboleth.xml
@@ -121,16 +121,16 @@ dl48KQ==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lap559t.bmc.lu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://lap559t.bmc.lu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
+  
+  
+  
+<md:ContactPerson contactType="administrative">
     <md:SurName>Rikard 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:SurName>Rikard Johansson</md:SurName>
     <md:EmailAddress>mailto:rikard.johansson@med.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:SurName>Rikard Johansson</md:SurName>
     <md:EmailAddress>mailto:rikard.johansson@med.lu.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/lis.ladok.sunet.se-shibboleth.xml b/swamid-2.0/lis.ladok.sunet.se-shibboleth.xml
index d3ac3884..c55e6f92 100644
--- a/swamid-2.0/lis.ladok.sunet.se-shibboleth.xml
+++ b/swamid-2.0/lis.ladok.sunet.se-shibboleth.xml
@@ -129,9 +129,9 @@ i23B
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lis.ladok.sunet.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lis.ladok.sunet.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>Olov</md:GivenName>
     <md:SurName>Höglund</md:SurName>
     <md:EmailAddress>mailto:olov.hoglund@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/lnu.hr.evry.se-shibboleth.xml b/swamid-2.0/lnu.hr.evry.se-shibboleth.xml
index 377e4d02..87aa38db 100644
--- a/swamid-2.0/lnu.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/lnu.hr.evry.se-shibboleth.xml
@@ -68,14 +68,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/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-dev.du.se-idp-shibboleth.xml b/swamid-2.0/login-dev.du.se-idp-shibboleth.xml
index f0f7e2c3..ca04563f 100644
--- a/swamid-2.0/login-dev.du.se-idp-shibboleth.xml
+++ b/swamid-2.0/login-dev.du.se-idp-shibboleth.xml
@@ -79,13 +79,13 @@ xZo/5fNrNmxFOTkpA3No03UwcJ2LDbzPUPQQbQ9s4GSwwSQMVmlstBI/IIY=
     <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">du.se</OrganizationName>
     <OrganizationDisplayName xml:lang="en">Högskolan Dalarna (Dev)</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.du.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>Högskolan Dalarna</Company>
     <EmailAddress>mailto:dempa@du.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/login.du.se-idp-shibboleth.xml b/swamid-2.0/login.du.se-idp-shibboleth.xml
index 7fceea33..29f6b7cb 100644
--- a/swamid-2.0/login.du.se-idp-shibboleth.xml
+++ b/swamid-2.0/login.du.se-idp-shibboleth.xml
@@ -101,28 +101,28 @@ GqI848rh0Iif5MpxnsYQ/mxwDirbsler7jpF0Q==
     <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">DU</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Högskolan Dalarna</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Dalarna University</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.du.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>Dalarna University</Company>
     <SurName>IT-avdelningen</SurName>
     <EmailAddress>mailto:shib-admin@du.se</EmailAddress>
     <TelephoneNumber>+46 23 778891</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>Dalarna University</Company>
     <SurName>IT-avdelningen</SurName>
     <EmailAddress>mailto:shib-admin@du.se</EmailAddress>
     <TelephoneNumber>+46 23 778891</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>Dalarna University</Company>
     <SurName>Högskolan Dalarna Support</SurName>
     <EmailAddress>mailto:support@du.se</EmailAddress>
     <TelephoneNumber>+46 23 778888</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/login.idp.eduid.se-idp.xml.xml b/swamid-2.0/login.idp.eduid.se-idp.xml.xml
index 55ecb1c8..47205909 100644
--- a/swamid-2.0/login.idp.eduid.se-idp.xml.xml
+++ b/swamid-2.0/login.idp.eduid.se-idp.xml.xml
@@ -95,27 +95,27 @@ iJwxGY2Nu6miPteDdWzv8ziUcLeSLvJaOY1aLwyx6cEvU7a94UkaPjhX
     <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.idp.eduid.se/sso/redirect"/>
     <ns0:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.idp.eduid.se/sso/post"/>
   </ns0:IDPSSODescriptor>
-  <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</ns0:OrganizationName>
     <ns0:OrganizationName xml:lang="sv">Sunet</ns0:OrganizationName>
     <ns0:OrganizationDisplayName xml:lang="en">eduID Sweden</ns0:OrganizationDisplayName>
     <ns0:OrganizationDisplayName xml:lang="sv">eduID Sverige</ns0:OrganizationDisplayName>
     <ns0:OrganizationURL xml:lang="en">http://www.eduid.se/</ns0:OrganizationURL>
-  </ns0:Organization>
-  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+  </ns0:Organization><ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <ns0:Company>eduID</ns0:Company>
     <ns0:SurName>Valter Nordh</ns0:SurName>
     <ns0:EmailAddress>mailto:valter@sunet.se</ns0:EmailAddress>
     <ns0:TelephoneNumber>+46707884742</ns0:TelephoneNumber>
-  </ns0:ContactPerson>
-  <ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </ns0:ContactPerson><ns0:ContactPerson xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <ns0:Company>eduID</ns0:Company>
     <ns0:SurName>SUNET eduID team</ns0:SurName>
     <ns0:EmailAddress>mailto:eduid-dev@SEGATE.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:Company>eduID</ns0:Company>
     <ns0:SurName>eduID Support</ns0:SurName>
     <ns0:EmailAddress>mailto:support@eduid.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
-</md:EntityDescriptor>
+  </ns0:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/login.idp.hhs.se-idp-shibboleth.xml b/swamid-2.0/login.idp.hhs.se-idp-shibboleth.xml
index 24b3c442..47946c23 100644
--- a/swamid-2.0/login.idp.hhs.se-idp-shibboleth.xml
+++ b/swamid-2.0/login.idp.hhs.se-idp-shibboleth.xml
@@ -136,24 +136,24 @@ DBM626i4mIwyB1PrBNFljTS6AHEcx3YnjQJfhPNnsabiQyqqAcTEGx6xhRKpvm1G
     </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.idp.hhs.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">Stockholm School of Economics</OrganizationName>
     <OrganizationName xml:lang="sv">Handelshögskolan i Stockholm</OrganizationName>
     <OrganizationDisplayName xml:lang="en">Stockholm School of Economics IdP</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="sv">Handelshögskolan i Stockholm IdP</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">https://www.hhs.se</OrganizationURL>
     <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:swamid.tech@hhs.se</EmailAddress>
     <TelephoneNumber>+4687369409</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">
     <EmailAddress>mailto:swamid.support@hhs.se</EmailAddress>
     <TelephoneNumber>+4687369400</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">
     <EmailAddress>mailto:swamid.admins@hhs.se</EmailAddress>
     <TelephoneNumber>+4687369417</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/login.ifmsa.se-spp.xml b/swamid-2.0/login.ifmsa.se-spp.xml
index a37f2548..8f454163 100644
--- a/swamid-2.0/login.ifmsa.se-spp.xml
+++ b/swamid-2.0/login.ifmsa.se-spp.xml
@@ -32,15 +32,15 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.ifmsa.se/spp/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://login.ifmsa.se/spp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">IFMSA-Sweden</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">IFMSA-Sweden</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">IFMSA-Sweden</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">IFMSA-Sweden</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">www.ifmsa.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:GivenName>Admin</md:GivenName>
     <md:EmailAddress>mailto:admin@ifmsa.se</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.ki.se-idp-shibboleth.xml b/swamid-2.0/login.ki.se-idp-shibboleth.xml
index c2146184..a52ea6b0 100644
--- a/swamid-2.0/login.ki.se-idp-shibboleth.xml
+++ b/swamid-2.0/login.ki.se-idp-shibboleth.xml
@@ -206,28 +206,28 @@ BazoaLKp7SoAtN5cqOcYTgOJY89fkO6T8gqd
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.ki.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
     <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.ki.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="en">KI</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Karolinska Institutet</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Karolinska Institutet</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.ki.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>Karolinska Institutet</Company>
     <SurName>Parisa Farzbod</SurName>
     <EmailAddress>mailto:parisa.farzbod@ki.se</EmailAddress>
     <TelephoneNumber>+46 8 524 86488</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>Karolinska Institutet</Company>
     <SurName>Eric Johansson</SurName>
     <EmailAddress>mailto:eric.johansson@ki.se</EmailAddress>
     <TelephoneNumber>+46 8 524 86382</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>Karolinska Institutet</Company>
     <SurName>IT-support</SurName>
     <EmailAddress>mailto:it-support@ki.se</EmailAddress>
     <TelephoneNumber>+46 8 524 82222</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 a26a5e92..88a352d7 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:webmaster@mynetwork.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/login.temp1235.hhs.se-adfs-services-trust.xml b/swamid-2.0/login.temp1235.hhs.se-adfs-services-trust.xml
index 22ec9da2..2da14c63 100644
--- a/swamid-2.0/login.temp1235.hhs.se-adfs-services-trust.xml
+++ b/swamid-2.0/login.temp1235.hhs.se-adfs-services-trust.xml
@@ -53,15 +53,15 @@
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.temp1235.hhs.se/adfs/ls/"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.temp1235.hhs.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">Handelshögskolan i Stockholm (TEST)</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Handelshögskolan i Stockholm (TEST)</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv">https://www.hhs.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>IT</GivenName>
     <SurName>Support</SurName>
     <EmailAddress>mailto:itsupport@hhs.se</EmailAddress>
     <TelephoneNumber>+46 8 7369400</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </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/login.varbi.com-simplesaml-module.php-saml-sp-metadata.php-varbi-sp.xml b/swamid-2.0/login.varbi.com-simplesaml-module.php-saml-sp-metadata.php-varbi-sp.xml
index f99e07de..c2ffaa55 100644
--- a/swamid-2.0/login.varbi.com-simplesaml-module.php-saml-sp-metadata.php-varbi-sp.xml
+++ b/swamid-2.0/login.varbi.com-simplesaml-module.php-saml-sp-metadata.php-varbi-sp.xml
@@ -43,9 +43,9 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.varbi.com/simplesaml/module.php/saml/sp/saml2-acs.php/varbi-sp" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.varbi.com/simplesaml/module.php/saml/sp/saml1-acs.php/varbi-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:webmaster@mynetwork.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/login1.fhs.se-adfs-services-trust.xml b/swamid-2.0/login1.fhs.se-adfs-services-trust.xml
index 59fa4f28..c2191832 100644
--- a/swamid-2.0/login1.fhs.se-adfs-services-trust.xml
+++ b/swamid-2.0/login1.fhs.se-adfs-services-trust.xml
@@ -62,30 +62,30 @@
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login1.fhs.se/adfs/ls/"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login1.fhs.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">Försvarshögskolan</OrganizationName>
     <OrganizationName xml:lang="en">Swedish Defence University</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Försvarshögskolan</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Swedish Defence University</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv">http://www.fhs.se/</OrganizationURL>
     <OrganizationURL xml:lang="en">http://www.fhs.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>Swedish Defence University</Company>
     <SurName>FHS IT Helpdesk</SurName>
     <EmailAddress>mailto:helpdesk@fhs.se</EmailAddress>
     <TelephoneNumber>+46 8 55342545</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>Swedish Defence University</Company>
     <SurName>FHS IT Helpdesk</SurName>
     <EmailAddress>mailto:helpdesk@fhs.se</EmailAddress>
     <TelephoneNumber>+46 8 55342545</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>Swedish Defence University</Company>
     <SurName>FHS IT Helpdesk</SurName>
     <EmailAddress>mailto:helpdesk@fhs.se</EmailAddress>
     <TelephoneNumber>+46 8 55342545</TelephoneNumber>
-  </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/ltu.hr.evry.se-shibboleth.xml b/swamid-2.0/ltu.hr.evry.se-shibboleth.xml
index 28e942d2..cf0c0eae 100644
--- a/swamid-2.0/ltu.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/ltu.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/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/lu.exigus.com-simplesaml-module.php-saml-sp-metadata.php-lu.xml b/swamid-2.0/lu.exigus.com-simplesaml-module.php-saml-sp-metadata.php-lu.xml
index 04d2a5ae..f6b32741 100644
--- a/swamid-2.0/lu.exigus.com-simplesaml-module.php-saml-sp-metadata.php-lu.xml
+++ b/swamid-2.0/lu.exigus.com-simplesaml-module.php-saml-sp-metadata.php-lu.xml
@@ -40,9 +40,9 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://lu.exigus.com/simplesaml/module.php/saml/sp/saml2-acs.php/lu" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lu.exigus.com/simplesaml/module.php/saml/sp/saml1-acs.php/lu/artifact" index="3"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>Pontus</md:GivenName>
     <md:SurName>Uggla</md:SurName>
     <md:EmailAddress>mailto:pontus@exigus.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/lu.test.instructure.com-saml2.xml b/swamid-2.0/lu.test.instructure.com-saml2.xml
index c0d26a79..1b6ef0e4 100644
--- a/swamid-2.0/lu.test.instructure.com-saml2.xml
+++ b/swamid-2.0/lu.test.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/lubcat.lub.lu.se-shibboleth.xml b/swamid-2.0/lubcat.lub.lu.se-shibboleth.xml
index 59d5c33d..2457c23a 100644
--- a/swamid-2.0/lubcat.lub.lu.se-shibboleth.xml
+++ b/swamid-2.0/lubcat.lub.lu.se-shibboleth.xml
@@ -98,14 +98,14 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lubcat.lub.lu.se:8443/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://lubcat.lub.lu.se:8443/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">LU</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Lund University</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">lu.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:Company>Lund University</md:Company>
     <md:SurName>Dave 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/ludicris.lub.lu.se-shibboleth.xml b/swamid-2.0/ludicris.lub.lu.se-shibboleth.xml
index d71d2df4..bccecd0f 100644
--- a/swamid-2.0/ludicris.lub.lu.se-shibboleth.xml
+++ b/swamid-2.0/ludicris.lub.lu.se-shibboleth.xml
@@ -81,9 +81,9 @@ uuNxKggJPJhRph8bitha6sR6EQ==</ds:X509Certificate>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://ludicris.lub.lu.se/admin/saml/SSO/alias/pure" index="0"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://ludicris.lub.lu.se/admin/saml/SSO/alias/pure" index="1" isDefault="true"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>David</md:GivenName>
     <md:SurName>Holoshka</md:SurName>
     <md:EmailAddress>mailto:david.holoshka@ub.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/lunduniversity.bridgeapp.com.xml b/swamid-2.0/lunduniversity.bridgeapp.com.xml
index fe15e200..358d9003 100644
--- a/swamid-2.0/lunduniversity.bridgeapp.com.xml
+++ b/swamid-2.0/lunduniversity.bridgeapp.com.xml
@@ -43,18 +43,18 @@ urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified
       <md:RequestedAttribute FriendlyName="Family name" Name="last_name" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic" isRequired="false"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="support">
+  
+  
+  
+<md:ContactPerson contactType="support">
     <md:SurName>Servicedesk</md:SurName>
     <md:EmailAddress>mailto:servicedesk@ldc.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:GivenName>Eskil</md:GivenName>
     <md:SurName>Swahn</md:SurName>
     <md:EmailAddress>mailto:eskil.swahn@ldc.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
+  </md:ContactPerson><md:ContactPerson contactType="administrative">
     <md:GivenName>Jennie</md:GivenName>
     <md:SurName>Paldanius</md:SurName>
     <md:EmailAddress>mailto:jennie.paldanius@ldc.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/luplay.education.lu.se-shibboleth.xml b/swamid-2.0/luplay.education.lu.se-shibboleth.xml
index d17deaea..0f49b86f 100644
--- a/swamid-2.0/luplay.education.lu.se-shibboleth.xml
+++ b/swamid-2.0/luplay.education.lu.se-shibboleth.xml
@@ -37,18 +37,18 @@
     <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://luplay.education.lu.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">LU Play</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">LU Play</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://luplay.education.lu.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:ContactPerson contactType="support">
+  </md:ContactPerson><md:ContactPerson contactType="support">
     <md:SurName>Servicedesk</md:SurName>
     <md:EmailAddress>mailto:servicedesk@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/maps.slu.se-shibboleth.xml b/swamid-2.0/maps.slu.se-shibboleth.xml
index 5e7a29f9..3ecb4179 100644
--- a/swamid-2.0/maps.slu.se-shibboleth.xml
+++ b/swamid-2.0/maps.slu.se-shibboleth.xml
@@ -59,14 +59,14 @@ QM0LY0RQjVj4+R+UdaRYQfizHG1rnKcEiRzi/mXYt2YXSjKuyvNUn6uc1GY9/3aJ
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://maps.slu.se/Shibboleth.sso/SAML/POST" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://maps.slu.se/Shibboleth.sso/SAML/Artifact" index="5"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
+  
+  
+<md:ContactPerson contactType="administrative">
     <md:GivenName>Mats</md:GivenName>
     <md:SurName>Högström</md:SurName>
     <md:EmailAddress>mailto:mats.hogstrom@slu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:GivenName>Johan</md:GivenName>
     <md:SurName>Fransson</md:SurName>
     <md:EmailAddress>mailto:johan.fransson@slu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/mdh.hr.evry.se-shibboleth.xml b/swamid-2.0/mdh.hr.evry.se-shibboleth.xml
index 35794320..52617392 100644
--- a/swamid-2.0/mdh.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/mdh.hr.evry.se-shibboleth.xml
@@ -68,14 +68,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/medlem.chs.chalmers.se-saml-simplesamlphp-www-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/medlem.chs.chalmers.se-saml-simplesamlphp-www-module.php-saml-sp-metadata.php-ageramedlem.xml
index dc71494b..0e4ec5b1 100644
--- a/swamid-2.0/medlem.chs.chalmers.se-saml-simplesamlphp-www-module.php-saml-sp-metadata.php-ageramedlem.xml
+++ b/swamid-2.0/medlem.chs.chalmers.se-saml-simplesamlphp-www-module.php-saml-sp-metadata.php-ageramedlem.xml
@@ -27,9 +27,9 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://medlem.chs.chalmers.se/saml/simplesamlphp/www/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.chs.chalmers.se/saml/simplesamlphp/www/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.consensus.liu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/medlem.consensus.liu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
index 2f2991b7..4db0f578 100644
--- a/swamid-2.0/medlem.consensus.liu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
+++ b/swamid-2.0/medlem.consensus.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.consensus.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.consensus.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.disk.su.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/medlem.disk.su.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
index 6020814e..0f197298 100644
--- a/swamid-2.0/medlem.disk.su.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
+++ b/swamid-2.0/medlem.disk.su.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.disk.su.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.disk.su.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.gotastudentkar.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/medlem.gotastudentkar.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
index 152cf46e..04739456 100644
--- a/swamid-2.0/medlem.gotastudentkar.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
+++ b/swamid-2.0/medlem.gotastudentkar.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.gotastudentkar.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.gotastudentkar.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.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/medlem.studentkareniboras.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/medlem.studentkareniboras.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
index 9b988fb0..2a7d3b5e 100644
--- a/swamid-2.0/medlem.studentkareniboras.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
+++ b/swamid-2.0/medlem.studentkareniboras.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.studentkareniboras.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.studentkareniboras.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.stuff.liu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/medlem.stuff.liu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
index abcd93a7..9bb95fee 100644
--- a/swamid-2.0/medlem.stuff.liu.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
+++ b/swamid-2.0/medlem.stuff.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.stuff.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.stuff.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.sus.su.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml b/swamid-2.0/medlem.sus.su.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
index 5b2cbf52..fc4a8c5d 100644
--- a/swamid-2.0/medlem.sus.su.se-saml-simplesamlwww-module.php-saml-sp-metadata.php-ageramedlem.xml
+++ b/swamid-2.0/medlem.sus.su.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.sus.su.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.sus.su.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/meetingtools-dev.app.nordu.net-saml2-sp-metadata.xml b/swamid-2.0/meetingtools-dev.app.nordu.net-saml2-sp-metadata.xml
index 37868007..4aa0b4b8 100644
--- a/swamid-2.0/meetingtools-dev.app.nordu.net-saml2-sp-metadata.xml
+++ b/swamid-2.0/meetingtools-dev.app.nordu.net-saml2-sp-metadata.xml
@@ -48,15 +48,15 @@ wXXiBDXS3PNHXQnnpys=
       <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">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:GivenName>Leif</md:GivenName>
     <md:SurName>Johansson</md:SurName>
     <md:EmailAddress>mailto:leifj@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/meta.eduroam.se.xml b/swamid-2.0/meta.eduroam.se.xml
index eaa4c28a..56f2e6d0 100644
--- a/swamid-2.0/meta.eduroam.se.xml
+++ b/swamid-2.0/meta.eduroam.se.xml
@@ -81,14 +81,14 @@ n1KiEHawTUUJfngoFN0QtwwvnExeTkUoAOa6ZYr5BscvnB9xKgaDgw==
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://meta.eduroam.se/Shibboleth.sso/SLO/Artifact"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://meta.eduroam.se/Shibboleth.sso/SAML2/POST" index="1"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>Paul</md:GivenName>
     <md:SurName>Scott</md:SurName>
     <md:EmailAddress>mailto:paul.scott@kau.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
+  </md:ContactPerson><md:ContactPerson contactType="administrative">
     <md:GivenName>Anders</md:GivenName>
     <md:SurName>Nilsson</md:SurName>
     <md:EmailAddress>mailto:anders.nilsson@umu.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 657a6ab6..a7504c6b 100644
--- a/swamid-2.0/miunidp.miun.se-idp-shibboleth.xml
+++ b/swamid-2.0/miunidp.miun.se-idp-shibboleth.xml
@@ -197,29 +197,29 @@ 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="administrative">
+  </Organization><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:SystemDriftIT@miun.se</EmailAddress>
     <TelephoneNumber>+46 771 975 000</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>Mid Sweden University</Company>
     <GivenName>Roger</GivenName>
     <SurName>Mårtensson</SurName>
     <EmailAddress>mailto:roger.martensson@miun.se</EmailAddress>
     <TelephoneNumber>+46 10 142 7888</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.su.se-shibboleth.sso.xml b/swamid-2.0/mondo.su.se-shibboleth.sso.xml
index 25765727..2d9fb31a 100644
--- a/swamid-2.0/mondo.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/mondo.su.se-shibboleth.sso.xml
@@ -88,8 +88,8 @@ z/E5dFvlHgjgE2ON6BQ/LtWQP5FMV/ZXjsRSINnc12T9AQV6Q4P51Q==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://mondo.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://mondo.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/moodle.lhs.se-shibboleth.xml b/swamid-2.0/moodle.lhs.se-shibboleth.xml
index 253e4062..8616eb57 100644
--- a/swamid-2.0/moodle.lhs.se-shibboleth.xml
+++ b/swamid-2.0/moodle.lhs.se-shibboleth.xml
@@ -39,14 +39,14 @@ t7tgUUB+rUENHrqryPN6AJ6QZR6UIWE6J6biQJVmXQldKGrGrMEnRecGyokj9kqi</ds:X509Certifi
     </KeyDescriptor>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://moodle.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">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>
     <SurName>helpdesk</SurName>
     <EmailAddress>mailto:helpdesk@it.su.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/moodle.med.lu.se-shibboleth.sso-login.xml b/swamid-2.0/moodle.med.lu.se-shibboleth.sso-login.xml
index 6b3994e6..96e39568 100644
--- a/swamid-2.0/moodle.med.lu.se-shibboleth.sso-login.xml
+++ b/swamid-2.0/moodle.med.lu.se-shibboleth.sso-login.xml
@@ -84,9 +84,9 @@ cl8xMXbSYMX3EVI03snOJy2ugpU+
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://moodle.med.lu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://moodle.med.lu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<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:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/moodle2.cs.lth.se-shibboleth.xml b/swamid-2.0/moodle2.cs.lth.se-shibboleth.xml
index 178d1cc1..9146bd6a 100644
--- a/swamid-2.0/moodle2.cs.lth.se-shibboleth.xml
+++ b/swamid-2.0/moodle2.cs.lth.se-shibboleth.xml
@@ -89,9 +89,9 @@ IPtsyyR5LVUuRnyvOaw=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://moodle2.cs.lth.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://moodle2.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>Möller</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/moodlealfa.omv.lu.se-shibboleth.sso-login.xml b/swamid-2.0/moodlealfa.omv.lu.se-shibboleth.sso-login.xml
index 63f70f4c..cf2b487a 100644
--- a/swamid-2.0/moodlealfa.omv.lu.se-shibboleth.sso-login.xml
+++ b/swamid-2.0/moodlealfa.omv.lu.se-shibboleth.sso-login.xml
@@ -84,9 +84,9 @@ jxMTwv+5jPOuJ1cD3OgQ/0w5fGcafO+Bpe/hJmCn5+wMHUCOvg==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://moodlealfa.omv.lu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://moodlealfa.omv.lu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<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: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/moria.sai.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/moria.sai.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 621a6443..06bffe48 100644
--- a/swamid-2.0/moria.sai.kau.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/moria.sai.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://moria.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://moria.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/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/nfg.su.se-shibboleth.sso.xml b/swamid-2.0/nfg.su.se-shibboleth.sso.xml
index 28d728e8..c3348fc6 100644
--- a/swamid-2.0/nfg.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/nfg.su.se-shibboleth.sso.xml
@@ -89,8 +89,8 @@ iEBP9GjIK/5IW3dJF+RPAqpatMcUUNM+lqcpMabxM5o=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://nfg.su.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://nfg.su.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </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/ni.nordu.net-saml2-metadata.xml b/swamid-2.0/ni.nordu.net-saml2-metadata.xml
index 46695444..78424f5d 100644
--- a/swamid-2.0/ni.nordu.net-saml2-metadata.xml
+++ b/swamid-2.0/ni.nordu.net-saml2-metadata.xml
@@ -43,10 +43,10 @@ GtDqiUnI4ewwuxmNcK7kU1vUmBsiKlS5lyo8c+hpTA==
       <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" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:Company>NORDUnet A/S</md:Company>
     <md:GivenName>Johan</md:GivenName>
     <md:SurName>Lundberg</md:SurName>
     <md:EmailAddress>mailto:lundberg@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/nidev-consumer.nordu.net-saml2-metadata.xml b/swamid-2.0/nidev-consumer.nordu.net-saml2-metadata.xml
index e566d29d..5f9e11d2 100644
--- a/swamid-2.0/nidev-consumer.nordu.net-saml2-metadata.xml
+++ b/swamid-2.0/nidev-consumer.nordu.net-saml2-metadata.xml
@@ -47,10 +47,10 @@ Z+RKbg==
       <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" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:Company>NORDUnet A/S</md:Company>
     <md:GivenName>Johan</md:GivenName>
     <md:SurName>Lundberg</md:SurName>
     <md:EmailAddress>mailto:lundberg@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/nyainloggning-test.hv.se-shibboleth.xml b/swamid-2.0/nyainloggning-test.hv.se-shibboleth.xml
index 528ab2dc..77f65891 100644
--- a/swamid-2.0/nyainloggning-test.hv.se-shibboleth.xml
+++ b/swamid-2.0/nyainloggning-test.hv.se-shibboleth.xml
@@ -125,8 +125,8 @@ kAVNeiHld7cgAfvBDN59cQlSlpraBCjnkV8WAMXDcFJ/7A==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://nyainloggning-test.hv.se/Shibboleth.sso/SAML2/ECP" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nyainloggning-test.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/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/openexam.bmc.uu.se-simplesaml.xml b/swamid-2.0/openexam.bmc.uu.se-simplesaml.xml
index c033f7a3..f963076d 100644
--- a/swamid-2.0/openexam.bmc.uu.se-simplesaml.xml
+++ b/swamid-2.0/openexam.bmc.uu.se-simplesaml.xml
@@ -46,20 +46,20 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://openexam.bmc.uu.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://openexam.bmc.uu.se/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
   </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="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:Company>Uppsala universitet</md:Company>
     <md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
+  </md:ContactPerson><md:ContactPerson contactType="support">
     <md:Company>Uppsala universitet</md:Company>
     <md:EmailAddress>mailto:openexam@bmc.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/openexam.test.uu.se-simplesaml.xml b/swamid-2.0/openexam.test.uu.se-simplesaml.xml
index fcf60db0..5a899461 100644
--- a/swamid-2.0/openexam.test.uu.se-simplesaml.xml
+++ b/swamid-2.0/openexam.test.uu.se-simplesaml.xml
@@ -46,20 +46,20 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://openexam.test.uu.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://openexam.test.uu.se/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
   </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="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:Company>Uppsala universitet</md:Company>
     <md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
+  </md:ContactPerson><md:ContactPerson contactType="support">
     <md:Company>Uppsala universitet</md:Company>
     <md:EmailAddress>mailto:openexam@bmc.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/openidp.feide.no.xml b/swamid-2.0/openidp.feide.no.xml
index 764de567..bb399958 100644
--- a/swamid-2.0/openidp.feide.no.xml
+++ b/swamid-2.0/openidp.feide.no.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://openidp.feide.no/simplesaml/saml2/idp/SSOService.php"/>
   </md:IDPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>Andreas</md:GivenName>
     <md:SurName>Åkre Solberg</md:SurName>
     <md:EmailAddress>mailto:andreas@uninett.no</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/pingpong-stage.hb.se-shibboleth.sso-metadata.xml b/swamid-2.0/pingpong-stage.hb.se-shibboleth.sso-metadata.xml
index 0f67cc3c..3cdeee79 100644
--- a/swamid-2.0/pingpong-stage.hb.se-shibboleth.sso-metadata.xml
+++ b/swamid-2.0/pingpong-stage.hb.se-shibboleth.sso-metadata.xml
@@ -52,25 +52,25 @@ kRhWnOJ7MGl/dXuesoTIyhkE5T2fMTM=
     <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-stage.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/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/pingpong.ki.se-shibboleth.xml b/swamid-2.0/pingpong.ki.se-shibboleth.xml
index af6fc225..679719e1 100644
--- a/swamid-2.0/pingpong.ki.se-shibboleth.xml
+++ b/swamid-2.0/pingpong.ki.se-shibboleth.xml
@@ -48,9 +48,9 @@ ZqAEwFI6mSdqDAH/wGtQLWPtrVSKg/XmB9+G8JohgWpphQElSQ==
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://pingpong.ki.se/Shibboleth.sso/SLO/Redirect"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pingpong.ki.se/Shibboleth.sso/SAML2/POST" index="0"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">KI</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.ki.se</md:OrganizationURL>
-  </md:Organization>
-</md:EntityDescriptor>
+  </md:Organization></md:EntityDescriptor>
diff --git a/swamid-2.0/play.bth.se.xml b/swamid-2.0/play.bth.se.xml
index 3dcabf54..bf0f17aa 100644
--- a/swamid-2.0/play.bth.se.xml
+++ b/swamid-2.0/play.bth.se.xml
@@ -37,14 +37,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.bth.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">BTH</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">BTH</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://play.bth.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/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.education.lu.se-shibboleth.xml b/swamid-2.0/play.education.lu.se-shibboleth.xml
index 1fc5088f..4087074c 100644
--- a/swamid-2.0/play.education.lu.se-shibboleth.xml
+++ b/swamid-2.0/play.education.lu.se-shibboleth.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.education.lu.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Lunds universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Lund University</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://play.education.lu.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.gu.se.xml b/swamid-2.0/play.gu.se.xml
index d7795aed..5c2c5db6 100644
--- a/swamid-2.0/play.gu.se.xml
+++ b/swamid-2.0/play.gu.se.xml
@@ -42,13 +42,13 @@ MIIENjCCAx6gAwIBAgIJAKLxSTc8gMTfMA0GCSqGSIb3DQEBBQUAMG8xCzAJBgNVBAYTAlNFMRMwEQYD
     <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.gu.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">GU Play</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">GU Play</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://play.gu.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.hb.se.xml b/swamid-2.0/play.hb.se.xml
index c0a86c40..ddfbf482 100644
--- a/swamid-2.0/play.hb.se.xml
+++ b/swamid-2.0/play.hb.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.hb.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">HB PLAY</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">HB PLAY</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://play.hb.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.hig.se.xml b/swamid-2.0/play.hig.se.xml
index 57a81ce2..10a8f9e7 100644
--- a/swamid-2.0/play.hig.se.xml
+++ b/swamid-2.0/play.hig.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.hig.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Högskolan i Gävle</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Högskolan i Gävle</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://play.hig.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.hj.se.xml b/swamid-2.0/play.hj.se.xml
index 17a0d79f..4bf5115a 100644
--- a/swamid-2.0/play.hj.se.xml
+++ b/swamid-2.0/play.hj.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.hj.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Högskolan i Jönköping</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Högskolan i Jönköping</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://play.hj.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.hkr.se.xml b/swamid-2.0/play.hkr.se.xml
index b8f6de89..59277b42 100644
--- a/swamid-2.0/play.hkr.se.xml
+++ b/swamid-2.0/play.hkr.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.hkr.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">HKRplay</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">HKRplay</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://play.hkr.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.hv.se.xml b/swamid-2.0/play.hv.se.xml
index b4ec66c9..1b83dafa 100644
--- a/swamid-2.0/play.hv.se.xml
+++ b/swamid-2.0/play.hv.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.hv.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">HV Play </md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">HV Play</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://play.hv.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.ju.se.xml b/swamid-2.0/play.ju.se.xml
index 5cd3230b..b450c847 100644
--- a/swamid-2.0/play.ju.se.xml
+++ b/swamid-2.0/play.ju.se.xml
@@ -40,14 +40,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.ju.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">JU play - Jönköping University</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">JU play - Jönköping University</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://play.ju.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/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.kth.se-external-kaltura.com.xml b/swamid-2.0/play.kth.se-external-kaltura.com.xml
index 5bae44a6..52b08e86 100644
--- a/swamid-2.0/play.kth.se-external-kaltura.com.xml
+++ b/swamid-2.0/play.kth.se-external-kaltura.com.xml
@@ -75,13 +75,13 @@ jyfJSjzHuZ9xMjMF/qdblGtl222vyg==
     <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.kth.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">KTH Play (Kaltura)</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">KTH Play (Kaltura)</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://corp.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/play.kth.se-external-kaltura.nordu.net.xml b/swamid-2.0/play.kth.se-external-kaltura.nordu.net.xml
index f0d8fd1a..808fca9a 100644
--- a/swamid-2.0/play.kth.se-external-kaltura.nordu.net.xml
+++ b/swamid-2.0/play.kth.se-external-kaltura.nordu.net.xml
@@ -39,13 +39,13 @@
     <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" Location="https://kaf-canvas-308.kaltura.nordu.net/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">MediaSpace</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">MediaSpace</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://kaf-canvas-308.kaltura.nordu.net</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.ltu.se.xml b/swamid-2.0/play.ltu.se.xml
index 04ae3e8c..bde775cb 100644
--- a/swamid-2.0/play.ltu.se.xml
+++ b/swamid-2.0/play.ltu.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.ltu.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Luleå Tekniska Universitet (PROD)</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Luleå Tekniska Universitet (PROD)</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://play.ltu.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.mau.se.xml b/swamid-2.0/play.mau.se.xml
index b62a4cce..9c405ceb 100644
--- a/swamid-2.0/play.mau.se.xml
+++ b/swamid-2.0/play.mau.se.xml
@@ -37,14 +37,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.mau.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Mau play</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Mau play</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://play.mau.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/play.mdh.se.xml b/swamid-2.0/play.mdh.se.xml
index 8fa9583c..1738eb39 100644
--- a/swamid-2.0/play.mdh.se.xml
+++ b/swamid-2.0/play.mdh.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.mdh.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Mälardalens Högskola (PROD)</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Mälardalens Högskola (PROD)</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://play.mdh.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.oru.se.xml b/swamid-2.0/play.oru.se.xml
index 9e663825..dc56d53b 100644
--- a/swamid-2.0/play.oru.se.xml
+++ b/swamid-2.0/play.oru.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.oru.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">ORU Play</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">ORU Play</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://play.oru.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.sh.se.xml b/swamid-2.0/play.sh.se.xml
index 4abe21eb..bae9dfa1 100644
--- a/swamid-2.0/play.sh.se.xml
+++ b/swamid-2.0/play.sh.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.sh.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Södertörns högskola</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Södertörns högskola</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://play.sh.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/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/play.smdb.kb.se.xml b/swamid-2.0/play.smdb.kb.se.xml
index 09fc4716..599742fe 100644
--- a/swamid-2.0/play.smdb.kb.se.xml
+++ b/swamid-2.0/play.smdb.kb.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.smdb.kb.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">SMDB Play</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">SMDB Play</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://play.smdb.kb.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.sunet.se.xml b/swamid-2.0/play.sunet.se.xml
index 578cfb59..830e0e31 100644
--- a/swamid-2.0/play.sunet.se.xml
+++ b/swamid-2.0/play.sunet.se.xml
@@ -30,13 +30,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.sunet.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">SUNET Play</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">SUNET Play</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://play.sunet.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.test.umu.se.xml b/swamid-2.0/play.test.umu.se.xml
index 85ee62f7..98119896 100644
--- a/swamid-2.0/play.test.umu.se.xml
+++ b/swamid-2.0/play.test.umu.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.test.umu.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Umeå universitet (TEST)</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Umeå universitet (TEST)</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://play.test.umu.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.umu.se.xml b/swamid-2.0/play.umu.se.xml
index be852e45..3f66fe2d 100644
--- a/swamid-2.0/play.umu.se.xml
+++ b/swamid-2.0/play.umu.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.umu.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Umeå universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Umeå universitet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://play.umu.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/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/portalfhs.onricoh.se-shibboleth.xml b/swamid-2.0/portalfhs.onricoh.se-shibboleth.xml
index 229e0761..0645eb20 100644
--- a/swamid-2.0/portalfhs.onricoh.se-shibboleth.xml
+++ b/swamid-2.0/portalfhs.onricoh.se-shibboleth.xml
@@ -90,19 +90,19 @@ CD7PLZk/IkwF0hNDcLbY51g4UEz40tQ=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://portalfhs.onricoh.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://portalfhs.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/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/portalmiun.onricoh.se-shibboleth.xml b/swamid-2.0/portalmiun.onricoh.se-shibboleth.xml
index 151a9a9f..0ae34fe6 100644
--- a/swamid-2.0/portalmiun.onricoh.se-shibboleth.xml
+++ b/swamid-2.0/portalmiun.onricoh.se-shibboleth.xml
@@ -90,19 +90,19 @@ ExFT9QQ3amEjepGH1v7O88qG5RbLnOwLcWiIsGK2eOWIaV23z2k=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://portalmiun.onricoh.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://portalmiun.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/portaluu.onricoh.se-shibboleth.xml b/swamid-2.0/portaluu.onricoh.se-shibboleth.xml
index 412fad51..eb2230da 100644
--- a/swamid-2.0/portaluu.onricoh.se-shibboleth.xml
+++ b/swamid-2.0/portaluu.onricoh.se-shibboleth.xml
@@ -90,19 +90,19 @@ p0owXoY2wveIE0oSDmHcviu3XXSHBjm7ySH629S4HQc=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://portaluu.onricoh.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://portaluu.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/portfolio.med.lu.se-shibboleth.xml b/swamid-2.0/portfolio.med.lu.se-shibboleth.xml
index 3c9cb00c..7ca1bb1c 100644
--- a/swamid-2.0/portfolio.med.lu.se-shibboleth.xml
+++ b/swamid-2.0/portfolio.med.lu.se-shibboleth.xml
@@ -89,17 +89,17 @@ gNOfZBrrhvhCai6Ddd9ns4MeNeoq9sc=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://portfolio.med.lu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://portfolio.med.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:EmailAddress>mailto:itservice@med.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/preklin.nu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/preklin.nu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 455207e6..d7eea08a 100644
--- a/swamid-2.0/preklin.nu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/preklin.nu-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -50,9 +50,9 @@ Dpkx/wL59aMiGk9AtYes2Mr1wU44nh2/JRWkSRBU4Ep+sb9jRFbn4/RZaNZqRnc=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://preklin.nu/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://preklin.nu/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="3"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>Alexander</md:GivenName>
     <md:SurName>Dangler</md:SurName>
     <md:EmailAddress>mailto:alexander.dangler@gmail.com</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/primula.lnu.se-shibboleth.xml b/swamid-2.0/primula.lnu.se-shibboleth.xml
index 4966139c..a1412c9d 100644
--- a/swamid-2.0/primula.lnu.se-shibboleth.xml
+++ b/swamid-2.0/primula.lnu.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/primula.mah.se-shibboleth.xml b/swamid-2.0/primula.mah.se-shibboleth.xml
index cd8cc51e..a8e29915 100644
--- a/swamid-2.0/primula.mah.se-shibboleth.xml
+++ b/swamid-2.0/primula.mah.se-shibboleth.xml
@@ -65,14 +65,14 @@ r4tfM1hij14r1PrjpJUPif6LEWVzjs23O6VQoKe7oEXlBwFRfw==
       <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/primulaweb.uadm.uu.se-shibboleth.xml b/swamid-2.0/primulaweb.uadm.uu.se-shibboleth.xml
index 16fbbc88..f5a3bc24 100644
--- a/swamid-2.0/primulaweb.uadm.uu.se-shibboleth.xml
+++ b/swamid-2.0/primulaweb.uadm.uu.se-shibboleth.xml
@@ -56,17 +56,17 @@ sSTegEDIGBp64fKxe6vEUaUKq8V9q/QGutnM87N8ZX39uYeNoUsxyA==
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://primulaweb.uadm.uu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://primulaweb.uadm.uu.se/Shibboleth.sso/SAML2/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="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="support">
+  </Organization><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/prisma.research.se-shibboleth.xml b/swamid-2.0/prisma.research.se-shibboleth.xml
index ede7cbc7..c6d7d9ba 100644
--- a/swamid-2.0/prisma.research.se-shibboleth.xml
+++ b/swamid-2.0/prisma.research.se-shibboleth.xml
@@ -95,19 +95,19 @@ Yw==
       <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">Prisma - prisma.research.se</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Prisma - prisma.research.se</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://prisma.research.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
+  </md:Organization><md:ContactPerson contactType="administrative">
     <md:GivenName>Peter</md:GivenName>
     <md:SurName>Borg</md:SurName>
     <md:EmailAddress>mailto:peter.borg@vr.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:GivenName>Robert</md:GivenName>
     <md:SurName>Chrudina</md:SurName>
     <md:EmailAddress>mailto:robert.chrudina@tieto.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/proquest-ra21.mnt.se-shibboleth.xml b/swamid-2.0/proquest-ra21.mnt.se-shibboleth.xml
index 352d9bb8..89757135 100644
--- a/swamid-2.0/proquest-ra21.mnt.se-shibboleth.xml
+++ b/swamid-2.0/proquest-ra21.mnt.se-shibboleth.xml
@@ -77,14 +77,14 @@ ozpzY2SFlw==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://proquest-ra21.mnt.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://proquest-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/proxytest.kib.ki.se-shibboleth.xml b/swamid-2.0/proxytest.kib.ki.se-shibboleth.xml
index 971734e3..6d799d42 100644
--- a/swamid-2.0/proxytest.kib.ki.se-shibboleth.xml
+++ b/swamid-2.0/proxytest.kib.ki.se-shibboleth.xml
@@ -67,8 +67,8 @@ ZT67aouI7EF6o10Y4HQ0sdtGPZz7S6QKpa9Yt8ukJmxLwux2jb6lIc+6ZBqNbPy5
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.proxytest.kib.ki.se/Shibboleth.sso/SAML/POST" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.proxytest.kib.ki.se/Shibboleth.sso/SAML/Artifact" index="4"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
+  
+<md:ContactPerson contactType="administrative">
     <md:SurName>Johan Finn</md:SurName>
     <md:EmailAddress>mailto:johan.finn@ki.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/publications.ki.se-shibboleth.xml b/swamid-2.0/publications.ki.se-shibboleth.xml
index d15576c7..40ba6237 100644
--- a/swamid-2.0/publications.ki.se-shibboleth.xml
+++ b/swamid-2.0/publications.ki.se-shibboleth.xml
@@ -109,9 +109,9 @@ ryntMn54coBlF2Vqrm4Fa2XUyUIkurCv3FZtdN5W
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://publications.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://publications.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
+  
+<md:ContactPerson contactType="administrative">
     <md:GivenName>KIB-IT</md:GivenName>
     <md:SurName>IT Helpdesk</md:SurName>
     <md:EmailAddress>mailto:itsupport@kib.ki.se</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/pubtestnew.kib.ki.se-shibboleth.xml b/swamid-2.0/pubtestnew.kib.ki.se-shibboleth.xml
index b9dc64c3..1fc4c992 100644
--- a/swamid-2.0/pubtestnew.kib.ki.se-shibboleth.xml
+++ b/swamid-2.0/pubtestnew.kib.ki.se-shibboleth.xml
@@ -99,9 +99,9 @@ ryntMn54coBlF2Vqrm4Fa2XUyUIkurCv3FZtdN5W
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pubtestnew.kib.ki.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://pubtestnew.kib.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
+  
+<md:ContactPerson contactType="administrative">
     <md:GivenName>KIB-IT</md:GivenName>
     <md:SurName>IT Helpdesk</md:SurName>
     <md:EmailAddress>mailto:itsupport@kib.ki.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/rb.lbic.lu.se.xml b/swamid-2.0/rb.lbic.lu.se.xml
index 88276319..3f338eba 100644
--- a/swamid-2.0/rb.lbic.lu.se.xml
+++ b/swamid-2.0/rb.lbic.lu.se.xml
@@ -40,9 +40,9 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://rb.lbic.lu.se/simplesaml/module.php/saml/sp/saml2-acs.php/rb" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://rb.lbic.lu.se/simplesaml/module.php/saml/sp/saml1-acs.php/rb/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/redcap.ki.se-shibboleth.xml b/swamid-2.0/redcap.ki.se-shibboleth.xml
index b0ccf4f5..9659175d 100644
--- a/swamid-2.0/redcap.ki.se-shibboleth.xml
+++ b/swamid-2.0/redcap.ki.se-shibboleth.xml
@@ -90,9 +90,9 @@ DOBgIJcDatI=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://redcap.ki.se/Shibboleth.sso/SAML/Artifact" index="6"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://redcap.ki.se/Shibboleth.sso/SAML2/POST" index="7"/>
   </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/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/registry-test.swamid.se-saml2-metadata.xml b/swamid-2.0/registry-test.swamid.se-saml2-metadata.xml
index 553586ae..dc7f2629 100644
--- a/swamid-2.0/registry-test.swamid.se-saml2-metadata.xml
+++ b/swamid-2.0/registry-test.swamid.se-saml2-metadata.xml
@@ -74,30 +74,30 @@ oMzgMjdgVTXdBPqXjdsunjPAiOZnJesxtLgWYEmQ
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://registry-test.swamid.se/saml2/ls/"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://registry-test.swamid.se/saml2/acs/" index="1"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+  
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">SWAMID</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">SWAMID</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://swamid.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:Company>NORDUnet</md:Company>
     <md:GivenName>Leif</md:GivenName>
     <md:SurName>Johansson</md:SurName>
     <md:EmailAddress>mailto:leifj@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
+  </md:ContactPerson><md:ContactPerson contactType="support">
     <md:GivenName>Fredrik</md:GivenName>
     <md:SurName>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:GivenName>Fredrik</md:GivenName>
     <md:SurName>Domeij</md:SurName>
     <md:EmailAddress>mailto:fredrik.domeij@umu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
+  </md:ContactPerson><md:ContactPerson contactType="administrative">
     <md:GivenName>Fredrik</md:GivenName>
     <md:SurName>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/registry.swamid.se-saml2-metadata.xml b/swamid-2.0/registry.swamid.se-saml2-metadata.xml
index 94b63b60..4a618853 100644
--- a/swamid-2.0/registry.swamid.se-saml2-metadata.xml
+++ b/swamid-2.0/registry.swamid.se-saml2-metadata.xml
@@ -54,24 +54,24 @@ jkl44jhVvXLSythVxryo/Mf7b8QbicsObxpxFMb9ifVbWyi5ri0WLgvQAXpyw/MH
       <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="sv">SWAMID</md:OrganizationName>
     <md:OrganizationName xml:lang="en">SWAMID</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">SWAMID</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">SWAMID</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">http://www.swamid.se</md:OrganizationURL>
     <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:GivenName>Anders</md:GivenName>
     <md:SurName>Lordal</md:SurName>
     <md:EmailAddress>mailto:anders.lordal@hig.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
+  </md:ContactPerson><md:ContactPerson contactType="administrative">
     <md:Company>SWAMID</md:Company>
     <md:GivenName>Anders</md:GivenName>
     <md:SurName>Lordal</md:SurName>
     <md:EmailAddress>mailto:anders.lordal@hig.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/rems.csc.fi.xml b/swamid-2.0/rems.csc.fi.xml
index 4e7deeb3..3d54e5e6 100644
--- a/swamid-2.0/rems.csc.fi.xml
+++ b/swamid-2.0/rems.csc.fi.xml
@@ -66,7 +66,10 @@
       <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="fi">CSC - Tieteen tietotekniikan keskus Oy</OrganizationName>
     <OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</OrganizationName>
     <OrganizationName xml:lang="sv">CSC - IT-centret för vetenskap</OrganizationName>
@@ -76,15 +79,12 @@
     <OrganizationURL xml:lang="fi">http://www.csc.fi</OrganizationURL>
     <OrganizationURL xml:lang="en">http://www.csc.fi</OrganizationURL>
     <OrganizationURL xml:lang="sv">http://www.csc.fi</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>Janne</GivenName>
     <SurName>Lauros</SurName>
     <EmailAddress>mailto:janne.lauros@csc.fi</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>Janne</GivenName>
     <SurName>Lauros</SurName>
     <EmailAddress>mailto:janne.lauros@csc.fi</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/rsc-ra21.mnt.se-shibboleth.xml b/swamid-2.0/rsc-ra21.mnt.se-shibboleth.xml
index ef134e96..822f7299 100644
--- a/swamid-2.0/rsc-ra21.mnt.se-shibboleth.xml
+++ b/swamid-2.0/rsc-ra21.mnt.se-shibboleth.xml
@@ -76,14 +76,14 @@ N9+dhbsHlWxxqoORNNMbe/1NBn7pKQIO3YhMs/XynxTRrRpS5ayjAQ==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://rsc-ra21.mnt.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://rsc-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/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/sam.control.lth.se-shibboleth.xml b/swamid-2.0/sam.control.lth.se-shibboleth.xml
index a7eb9287..dd480055 100644
--- a/swamid-2.0/sam.control.lth.se-shibboleth.xml
+++ b/swamid-2.0/sam.control.lth.se-shibboleth.xml
@@ -94,9 +94,9 @@ R83DjysdqOkJezZxfXnsgdhDpyo=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sam.control.lth.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sam.control.lth.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>Anders</md:GivenName>
     <md:SurName>Nilsson</md:SurName>
     <md:EmailAddress>mailto:anders.nilsson@control.lth.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/sam.cs.lth.se-shibboleth.xml b/swamid-2.0/sam.cs.lth.se-shibboleth.xml
index 1032cfd2..e0564096 100644
--- a/swamid-2.0/sam.cs.lth.se-shibboleth.xml
+++ b/swamid-2.0/sam.cs.lth.se-shibboleth.xml
@@ -97,9 +97,9 @@ eantehm2RWmRIz8poebeGW4oirdCtSho8ZuO5JgDcxMB4gUV/QgPmfrxo0cTAL/7
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://matstat.sam.cs.lth.se/Shibboleth.sso/SAML/POST" index="23"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://matstat.cs.lth.se/Shibboleth.sso/SAML/Artifact" index="24"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>Per</md:GivenName>
     <md:SurName>Andersson</md:SurName>
     <md:EmailAddress>mailto:Per.Andersson@cs.lth.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md: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 c51fd08e..0fe5ba79 100644
--- a/swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml
+++ b/swamid-2.0/saml.sys.kth.se-idp-shibboleth.xml
@@ -136,32 +136,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, Hans Berggren, Jonas Andersson)</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, Hans Berggren, Jonas Andersson)</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/samsok.libris.kb.se-shibboleth.xml b/swamid-2.0/samsok.libris.kb.se-shibboleth.xml
index 675e75ce..779a8c0f 100644
--- a/swamid-2.0/samsok.libris.kb.se-shibboleth.xml
+++ b/swamid-2.0/samsok.libris.kb.se-shibboleth.xml
@@ -15,15 +15,15 @@
     </KeyDescriptor>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://samsok.libris.kb.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">Libris</OrganizationName>
     <OrganizationDisplayName xml:lang="en">Libris</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.kb.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>Kungliga Biblioteket</Company>
     <GivenName>Arvid</GivenName>
     <SurName>Oja</SurName>
     <EmailAddress>mailto:arvid.oja@kb.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/scalear-saml.herokuapp.com.xml b/swamid-2.0/scalear-saml.herokuapp.com.xml
index 708acffd..e95153bb 100644
--- a/swamid-2.0/scalear-saml.herokuapp.com.xml
+++ b/swamid-2.0/scalear-saml.herokuapp.com.xml
@@ -35,9 +35,9 @@
     <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" index="1" Location="https://scalear-saml.herokuapp.com/saml/consume"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Scalable Learning</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Scalable Learning</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.scalable-learning.com</md:OrganizationURL>
-  </md:Organization>
-</md:EntityDescriptor>
+  </md:Organization></md:EntityDescriptor>
diff --git a/swamid-2.0/scalear-staging2.herokuapp.com.xml b/swamid-2.0/scalear-staging2.herokuapp.com.xml
index c51dc79c..26a05b81 100644
--- a/swamid-2.0/scalear-staging2.herokuapp.com.xml
+++ b/swamid-2.0/scalear-staging2.herokuapp.com.xml
@@ -69,22 +69,22 @@ B2dCYBmx
       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" 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">Scalable Learning</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Scalable Learning</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://scalear-staging2.herokuapp.com</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </md:Organization><md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>ScalableLearning</Company>
     <EmailAddress>mailto:support@scalable-learning.com</EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+  </md:ContactPerson><md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>ScalableLearning</Company>
     <EmailAddress>mailto:support@scalable-learning.com</EmailAddress>
-  </md:ContactPerson>
-  <md: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">
+  </md:ContactPerson><md: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">
     <Company>ScalableLearning</Company>
     <GivenName>Security Response Team</GivenName>
     <EmailAddress>mailto:support@scalable-learning.com</EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/sciencedirect-ra21.mnt.se-shibboleth.xml b/swamid-2.0/sciencedirect-ra21.mnt.se-shibboleth.xml
index 9cdde4fa..39490e22 100644
--- a/swamid-2.0/sciencedirect-ra21.mnt.se-shibboleth.xml
+++ b/swamid-2.0/sciencedirect-ra21.mnt.se-shibboleth.xml
@@ -77,14 +77,14 @@ yJh/Ogdw9ygHU2WVNt79W02hh9M6qw==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sciencedirect-ra21.mnt.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sciencedirect-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/sdauth.sciencedirect.com.xml b/swamid-2.0/sdauth.sciencedirect.com.xml
index 5334999f..22c7ec2d 100644
--- a/swamid-2.0/sdauth.sciencedirect.com.xml
+++ b/swamid-2.0/sdauth.sciencedirect.com.xml
@@ -51,21 +51,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">Elsevier B.V.</OrganizationName>
     <OrganizationDisplayName xml:lang="en">Elsevier</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.elsevier.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">
     <GivenName>Elsevier Shibboleth Support</GivenName>
     <EmailAddress>mailto:shibbolethsupport@elsevier.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>Elsevier Shibboleth Support</GivenName>
     <EmailAddress>mailto:shibbolethsupport@elsevier.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>Elsevier Security Incident Response</GivenName>
     <EmailAddress>mailto:contentprotectionservices@elsevier.com</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/se-su-shibboleth.moveon4.de-shibboleth.xml b/swamid-2.0/se-su-shibboleth.moveon4.de-shibboleth.xml
index e89f9204..66cd58de 100644
--- a/swamid-2.0/se-su-shibboleth.moveon4.de-shibboleth.xml
+++ b/swamid-2.0/se-su-shibboleth.moveon4.de-shibboleth.xml
@@ -86,19 +86,19 @@ ORdz4OYhGDrkzrDGPPYK74Je3Ukth57uYoySsyMM5huK/adFEbHOg8L6/ngd
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://se-su-shibboleth.moveon4.de/Shibboleth.sso/SAML2/ECP" index="8"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://se-su-shibboleth.moveon4.de/Shibboleth.sso/SAML2/POST" index="9"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">qs-unisolution</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">qs-unisolution</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.qs-unisolution.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
+  </md:Organization><md:ContactPerson contactType="support">
     <md:GivenName>Fiona</md:GivenName>
     <md:SurName>Gutsch</md:SurName>
     <md:EmailAddress>mailto:fiona.gutsch@qs-unisolution.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:GivenName>Harish</md:GivenName>
     <md:SurName>Gowda</md:SurName>
     <md:EmailAddress>mailto:harish@qs.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/se-uppsala-shibboleth.moveon4.de-shibboleth.xml b/swamid-2.0/se-uppsala-shibboleth.moveon4.de-shibboleth.xml
index 94ba6170..55f70511 100644
--- a/swamid-2.0/se-uppsala-shibboleth.moveon4.de-shibboleth.xml
+++ b/swamid-2.0/se-uppsala-shibboleth.moveon4.de-shibboleth.xml
@@ -98,19 +98,19 @@ dO71JDwafFU98DsnJegXNKiDgIUuH9uCMKGrWU/PFdyLkgMBV3zKuul6MQg804XQ
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://se-uppsala-shibboleth.moveon4.de/Shibboleth.sso/SAML2/ECP" index="8"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://se-uppsala-shibboleth.moveon4.de/Shibboleth.sso/SAML2/POST" index="9"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">qs-unisolution</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">qs-unisolution</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.qs-unisolution.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
+  </md:Organization><md:ContactPerson contactType="support">
     <md:GivenName>Fiona</md:GivenName>
     <md:SurName>Gutsch</md:SurName>
     <md:EmailAddress>mailto:fiona.gutsch@qs-unisolution.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:GivenName>Abdul</md:GivenName>
     <md:SurName>Jabbar</md:SurName>
     <md:EmailAddress>mailto:abdul.jabbar@zeptosystems.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/se.timeedit.net-bth-staff-test.xml b/swamid-2.0/se.timeedit.net-bth-staff-test.xml
index 2b6159b2..2ac81c89 100644
--- a/swamid-2.0/se.timeedit.net-bth-staff-test.xml
+++ b/swamid-2.0/se.timeedit.net-bth-staff-test.xml
@@ -41,14 +41,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://cloud.timeedit.net/bth_test/web/timeedit/ssoResponse/bth_saml2_staff"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="sv">TimeEdit AB</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">TimeEdit AB</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">http://www.timeedit.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:GivenName>TimeEdit</md:GivenName>
     <md:SurName>Support</md:SurName>
     <md:EmailAddress>mailto:support@timeedit.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/se.timeedit.net-bth-staff.xml b/swamid-2.0/se.timeedit.net-bth-staff.xml
index d1889f9a..6d023ee5 100644
--- a/swamid-2.0/se.timeedit.net-bth-staff.xml
+++ b/swamid-2.0/se.timeedit.net-bth-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/bth/db1/timeedit/ssoResponse/bth_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-bth-stud-test.xml b/swamid-2.0/se.timeedit.net-bth-stud-test.xml
index 640d4e98..5145e416 100644
--- a/swamid-2.0/se.timeedit.net-bth-stud-test.xml
+++ b/swamid-2.0/se.timeedit.net-bth-stud-test.xml
@@ -41,14 +41,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://cloud.timeedit.net/bth_test/web/timeedit/ssoResponse/bth_saml2_stud"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="sv">TimeEdit AB</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">TimeEdit AB</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">http://www.timeedit.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:GivenName>TimeEdit</md:GivenName>
     <md:SurName>Support</md:SurName>
     <md:EmailAddress>mailto:support@timeedit.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/se.timeedit.net-bth-stud.xml b/swamid-2.0/se.timeedit.net-bth-stud.xml
index de23424c..71cbd4df 100644
--- a/swamid-2.0/se.timeedit.net-bth-stud.xml
+++ b/swamid-2.0/se.timeedit.net-bth-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/bth/db1/timeedit/ssoResponse/bth_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-chalmers-sp.xml b/swamid-2.0/se.timeedit.net-chalmers-sp.xml
index 11becef1..3edef720 100644
--- a/swamid-2.0/se.timeedit.net-chalmers-sp.xml
+++ b/swamid-2.0/se.timeedit.net-chalmers-sp.xml
@@ -40,9 +40,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/chalmers/db1/timeedit/ssoResponse/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-fhs-staff.xml b/swamid-2.0/se.timeedit.net-fhs-staff.xml
index 74c36758..e6b04a97 100644
--- a/swamid-2.0/se.timeedit.net-fhs-staff.xml
+++ b/swamid-2.0/se.timeedit.net-fhs-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://cloud.timeedit.net/fhs_se/web/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-fhs-stud.xml b/swamid-2.0/se.timeedit.net-fhs-stud.xml
index a261105b..36d8498a 100644
--- a/swamid-2.0/se.timeedit.net-fhs-stud.xml
+++ b/swamid-2.0/se.timeedit.net-fhs-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://cloud.timeedit.net/fhs_se/web/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-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-kau-employee-sp.xml b/swamid-2.0/se.timeedit.net-kau-employee-sp.xml
index 7114be20..56217d73 100644
--- a/swamid-2.0/se.timeedit.net-kau-employee-sp.xml
+++ b/swamid-2.0/se.timeedit.net-kau-employee-sp.xml
@@ -47,13 +47,13 @@ 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/kau/db1/timeedit/ssoResponse/personal_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="support">
+  </md:ContactPerson><md:ContactPerson contactType="support">
     <md:SurName>IT-avdelningen</md:SurName>
     <md:EmailAddress>mailto:2525@kau.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/se.timeedit.net-kau-student-sp.xml b/swamid-2.0/se.timeedit.net-kau-student-sp.xml
index b15de830..c408db0d 100644
--- a/swamid-2.0/se.timeedit.net-kau-student-sp.xml
+++ b/swamid-2.0/se.timeedit.net-kau-student-sp.xml
@@ -47,13 +47,13 @@ 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/kau/db1/timeedit/ssoResponse/student_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="support">
+  </md:ContactPerson><md:ContactPerson contactType="support">
     <md:SurName>IT-avdelningen</md:SurName>
     <md:EmailAddress>mailto:2525@kau.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/se.timeedit.net-ki.xml b/swamid-2.0/se.timeedit.net-ki.xml
index 5ea54ac4..676064e6 100644
--- a/swamid-2.0/se.timeedit.net-ki.xml
+++ b/swamid-2.0/se.timeedit.net-ki.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/ki/db1/timeedit/ssoResponse/swamid_ki"/>
   </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>Eric</md:GivenName>
     <md:SurName>Johansson</md:SurName>
     <md:EmailAddress>mailto:eric.johansson@ki.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/se.timeedit.net-kth-employee-sp.xml b/swamid-2.0/se.timeedit.net-kth-employee-sp.xml
index 5c8e7e2e..7bfed170 100644
--- a/swamid-2.0/se.timeedit.net-kth-employee-sp.xml
+++ b/swamid-2.0/se.timeedit.net-kth-employee-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_anst"/>
   </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-employee-sp.xml b/swamid-2.0/se.timeedit.net-lu-employee-sp.xml
index 81fe6eb7..73175f5a 100644
--- a/swamid-2.0/se.timeedit.net-lu-employee-sp.xml
+++ b/swamid-2.0/se.timeedit.net-lu-employee-sp.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/lu/db1/timeedit/ssoResponse/lu_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-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-lu-student-sp.xml b/swamid-2.0/se.timeedit.net-lu-student-sp.xml
index 5e72a15d..d52c8437 100644
--- a/swamid-2.0/se.timeedit.net-lu-student-sp.xml
+++ b/swamid-2.0/se.timeedit.net-lu-student-sp.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/lu/db1/timeedit/ssoResponse/lu_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/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-saimia-generic-sp.xml b/swamid-2.0/se.timeedit.net-saimia-generic-sp.xml
index 4063ec3d..26b9a132 100644
--- a/swamid-2.0/se.timeedit.net-saimia-generic-sp.xml
+++ b/swamid-2.0/se.timeedit.net-saimia-generic-sp.xml
@@ -55,9 +55,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-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-su-employee-sp.xml b/swamid-2.0/se.timeedit.net-su-employee-sp.xml
index 151f48a4..7fe11524 100644
--- a/swamid-2.0/se.timeedit.net-su-employee-sp.xml
+++ b/swamid-2.0/se.timeedit.net-su-employee-sp.xml
@@ -40,9 +40,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/su/db1/timeedit/ssoResponse/su_anst_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-su-student-sp.xml b/swamid-2.0/se.timeedit.net-su-student-sp.xml
index 4e414bc4..da6a4df1 100644
--- a/swamid-2.0/se.timeedit.net-su-student-sp.xml
+++ b/swamid-2.0/se.timeedit.net-su-student-sp.xml
@@ -40,9 +40,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/su/db1/timeedit/ssoResponse/su_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/se.timeedit.net-umu-employee-sp.xml b/swamid-2.0/se.timeedit.net-umu-employee-sp.xml
index 7154d241..cad411df 100644
--- a/swamid-2.0/se.timeedit.net-umu-employee-sp.xml
+++ b/swamid-2.0/se.timeedit.net-umu-employee-sp.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/umu/db1/timeedit/p/empres2/ssoResponse/umu_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-umu-student-sp.xml b/swamid-2.0/se.timeedit.net-umu-student-sp.xml
index 9168e662..923567ad 100644
--- a/swamid-2.0/se.timeedit.net-umu-student-sp.xml
+++ b/swamid-2.0/se.timeedit.net-umu-student-sp.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/umu/db1/timeedit/p/studres2/ssoResponse/umu_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/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.port.se-shibboleth.xml b/swamid-2.0/secure.port.se-shibboleth.xml
index 442b9b90..4a572be3 100644
--- a/swamid-2.0/secure.port.se-shibboleth.xml
+++ b/swamid-2.0/secure.port.se-shibboleth.xml
@@ -87,9 +87,9 @@ VaVIi9tnmwAwQSVBw0L1rPCgy5X91UScJk5EIDL1Z8VO+7gnJmh73cvgL/7tfR8Z
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://secure.port.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://secure.port.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>Lennart</md:GivenName>
     <md:SurName>Risfelt</md:SurName>
     <md:EmailAddress>mailto:lennart@port.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 f7ab614c..abb95444 100644
--- a/swamid-2.0/secure.urkund.com-shibboleth.xml
+++ b/swamid-2.0/secure.urkund.com-shibboleth.xml
@@ -98,22 +98,22 @@ gEln3A==
       <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>Samuel</md:GivenName>
     <md:SurName>Otter</md:SurName>
     <md:EmailAddress>mailto:samuel@onposition.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/selfservice-test.test.hb.se-shibboleth.xml b/swamid-2.0/selfservice-test.test.hb.se-shibboleth.xml
index 873daa92..9ad905d6 100644
--- a/swamid-2.0/selfservice-test.test.hb.se-shibboleth.xml
+++ b/swamid-2.0/selfservice-test.test.hb.se-shibboleth.xml
@@ -127,22 +127,22 @@ jdkRrWzWFJhSCRj04tS0Oyw=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://selfservice-test.test.hb.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://selfservice-test.test.hb.se/Shibboleth.sso/SAML2/ECP" index="4"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
+  
+  
+  
+<md:ContactPerson contactType="administrative">
     <md:Company>University of Borås</md:Company>
     <md:SurName>IT</md:SurName>
     <md:EmailAddress>mailto:campusservice@hb.se</md:EmailAddress>
     <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:Company>University of Borås</md:Company>
     <md:SurName>IT</md:SurName>
     <md:EmailAddress>mailto:campusservice@hb.se</md:EmailAddress>
     <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
+  </md:ContactPerson><md:ContactPerson contactType="support">
     <md:Company>University of Borås</md:Company>
     <md:SurName>IT</md:SurName>
     <md:EmailAddress>mailto:campusservice@hb.se</md:EmailAddress>
     <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/selfservice.hb.se-shibboleth.xml b/swamid-2.0/selfservice.hb.se-shibboleth.xml
index 57e7ed60..64f8ed7d 100644
--- a/swamid-2.0/selfservice.hb.se-shibboleth.xml
+++ b/swamid-2.0/selfservice.hb.se-shibboleth.xml
@@ -129,22 +129,22 @@ toA=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://selfservice.hb.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://selfservice.hb.se/Shibboleth.sso/SAML2/ECP" index="4"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
+  
+  
+  
+<md:ContactPerson contactType="administrative">
     <md:Company>University of Borås</md:Company>
     <md:SurName>IT</md:SurName>
     <md:EmailAddress>mailto:campusservice@hb.se</md:EmailAddress>
     <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:Company>University of Borås</md:Company>
     <md:SurName>IT</md:SurName>
     <md:EmailAddress>mailto:campusservice@hb.se</md:EmailAddress>
     <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
+  </md:ContactPerson><md:ContactPerson contactType="support">
     <md:Company>University of Borås</md:Company>
     <md:SurName>IT</md:SurName>
     <md:EmailAddress>mailto:campusservice@hb.se</md:EmailAddress>
     <md:TelephoneNumber>+46 33 435 4690</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/service.projectplace.com-saml-metadata.xml b/swamid-2.0/service.projectplace.com-saml-metadata.xml
index 972940e8..1a824d40 100644
--- a/swamid-2.0/service.projectplace.com-saml-metadata.xml
+++ b/swamid-2.0/service.projectplace.com-saml-metadata.xml
@@ -41,15 +41,15 @@ qn0pH3p8ik4RiHD3Od8k9acHCj/dO4PyTbAjgYuUS23yUBbJOmow6eje/HNpQs9E
     </md:KeyDescriptor>
     <md:AssertionConsumerService index="0" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://service.projectplace.com/saml/login" isDefault="true"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Projectplace International AB</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Projectplace International AB</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.projectplace.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
+  </md:Organization><md:ContactPerson contactType="support">
     <md:EmailAddress>mailto:support@projectplace.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:EmailAddress>mailto:saml@projectplace.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/sesam.uu.se-shibboleth.xml b/swamid-2.0/sesam.uu.se-shibboleth.xml
index 0dc4e560..c9a9dd21 100644
--- a/swamid-2.0/sesam.uu.se-shibboleth.xml
+++ b/swamid-2.0/sesam.uu.se-shibboleth.xml
@@ -67,15 +67,15 @@ Ob0pZI5pkqdbQ/X+dGRz0ifwq1CQ44OjMnFi
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sesam.uu.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sesam.uu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
   </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/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/shib-idp-test.oru.se-idp-shibboleth.xml b/swamid-2.0/shib-idp-test.oru.se-idp-shibboleth.xml
index 727efa0c..285fa1b9 100644
--- a/swamid-2.0/shib-idp-test.oru.se-idp-shibboleth.xml
+++ b/swamid-2.0/shib-idp-test.oru.se-idp-shibboleth.xml
@@ -189,9 +189,9 @@ d3hB7quCN72lcAz/8iZU
     </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-idp-test.oru.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
   </AttributeAuthorityDescriptor>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  
+<ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <GivenName>Jonny</GivenName>
     <SurName>Ehrnberg</SurName>
     <EmailAddress>mailto:jonny.ehrnberg@oru.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/shib1.oru.se-shibboleth.xml b/swamid-2.0/shib1.oru.se-shibboleth.xml
index ec7e8cbd..5ccbcba8 100644
--- a/swamid-2.0/shib1.oru.se-shibboleth.xml
+++ b/swamid-2.0/shib1.oru.se-shibboleth.xml
@@ -116,10 +116,10 @@ Rqzek48aKj1lgjemCqPvuxaeTjFaQej9JLrxyQ1cWvsSYLuW4wnq4uvKdFRKr1hP
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib1.oru.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib1.oru.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:Company>Örebro University</md:Company>
     <md:SurName>Jonny Ehrnberg</md:SurName>
     <md:EmailAddress>mailto:itsupport@oru.se</md:EmailAddress>
     <md:TelephoneNumber>+46 19 303166</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md: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.turnitin.com-shibboleth.xml b/swamid-2.0/shibboleth.turnitin.com-shibboleth.xml
index 55c61526..c9e977c9 100644
--- a/swamid-2.0/shibboleth.turnitin.com-shibboleth.xml
+++ b/swamid-2.0/shibboleth.turnitin.com-shibboleth.xml
@@ -120,9 +120,9 @@ MiUBL1nM
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.turnitin.com/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shibboleth.turnitin.com/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>River</md:GivenName>
     <md:SurName>Lune</md:SurName>
     <md:EmailAddress>mailto:rlune@turnitin.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md: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 d79f5780..cd0e6075 100644
--- a/swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml
+++ b/swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml
@@ -97,28 +97,28 @@ 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>Anders Brouzell</SurName>
     <EmailAddress>mailto:anders.brouzell@uhr.se</EmailAddress>
     <TelephoneNumber>070-839 62 36</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 Swedish Council for Higher Education</Company>
     <SurName>Anders Brouzell</SurName>
     <EmailAddress>mailto:anders.brouzell@uhr.se</EmailAddress>
     <TelephoneNumber>+46 70839 62 36</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 Swedish Council for Higher Education</Company>
     <SurName>Anders Brouzell</SurName>
     <EmailAddress>mailto:anders.brouzell@uhr.se</EmailAddress>
     <TelephoneNumber>+46 70839 62 36</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/sirtfi-check.swamid.se-shibboleth.xml b/swamid-2.0/sirtfi-check.swamid.se-shibboleth.xml
index cf3e7955..da61b4c5 100644
--- a/swamid-2.0/sirtfi-check.swamid.se-shibboleth.xml
+++ b/swamid-2.0/sirtfi-check.swamid.se-shibboleth.xml
@@ -111,8 +111,8 @@ JRf9VO1D1PoLKLI1hA==
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sirtfi-check.swamid.se/Shibboleth.sso/SLO/Artifact"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sirtfi-check.swamid.se/Shibboleth.sso/SAML2/POST" index="1"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>Technical</md:GivenName>
     <md:EmailAddress>mailto:operations@swamid.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/siths-idp.sunet.se-saml2-idp-metadata.php.xml b/swamid-2.0/siths-idp.sunet.se-saml2-idp-metadata.php.xml
index 493f36c6..3069a9fa 100644
--- a/swamid-2.0/siths-idp.sunet.se-saml2-idp-metadata.php.xml
+++ b/swamid-2.0/siths-idp.sunet.se-saml2-idp-metadata.php.xml
@@ -50,14 +50,14 @@
     <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://siths-idp.sunet.se/saml2/idp/SSOService.php"/>
   </md:IDPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">SITHS Login (SUNET)</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">SITHS Login (SUNET)</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>Leif</md:GivenName>
     <md:SurName>Johansson</md:SurName>
     <md:EmailAddress>mailto:leifj@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/slcstest.uninett.no-simplesaml-shib13-sp-metadata.php.xml b/swamid-2.0/slcstest.uninett.no-simplesaml-shib13-sp-metadata.php.xml
index d57ed102..70bc81a2 100644
--- a/swamid-2.0/slcstest.uninett.no-simplesaml-shib13-sp-metadata.php.xml
+++ b/swamid-2.0/slcstest.uninett.no-simplesaml-shib13-sp-metadata.php.xml
@@ -15,8 +15,8 @@
     </KeyDescriptor>
     <AssertionConsumerService index="0" Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://slcstest.uninett.no/simplesaml/shib13/sp/AssertionConsumerService.php"/>
   </SPSSODescriptor>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  
+<ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <SurName>Administrator</SurName>
     <EmailAddress>mailto:henrik.austad@uninett.no</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/slltest2.luvit.se-shibboleth.xml b/swamid-2.0/slltest2.luvit.se-shibboleth.xml
index d8d4df3f..2e47e405 100644
--- a/swamid-2.0/slltest2.luvit.se-shibboleth.xml
+++ b/swamid-2.0/slltest2.luvit.se-shibboleth.xml
@@ -112,7 +112,7 @@ lmNgza+oGPGkyvuOaiCHWwyRsT9UmlVUOgZK1z5rZVSSSJiR7tRdYrE=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://slltest2.luvit.se/Shibboleth.sso/SAML2/ECP" index="9"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://slltest2.luvit.se/Shibboleth.sso/SAML2/POST" index="10"/>
   </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/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-test.it.su.se-shibboleth.sso.xml b/swamid-2.0/sp-test.it.su.se-shibboleth.sso.xml
index f3bdc305..b6663f1f 100644
--- a/swamid-2.0/sp-test.it.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/sp-test.it.su.se-shibboleth.sso.xml
@@ -59,8 +59,8 @@ ZZ++pFd6COZSWkvz3O0kbDXKOANgr4ZylWIxYz+Fj1y8i5PN5C85ojDAIvzZ93J5
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-test.it.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp-test.it.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
   </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/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/sp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/sp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml
index bf9787b3..dfd95a6c 100644
--- a/swamid-2.0/sp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/sp.snd.gu.se-module.php-saml-sp-metadata.php-default-sp.xml
@@ -52,17 +52,17 @@
       <md:RequestedAttribute FriendlyName="givenName" isRequired="false" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">SND Gothenburg University</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">SND Göteborgs universitet</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Swedish National Data Service Gothenburg University</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Svensk Nationell Datatjänsti Göteborgs universitet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://snd.gu.se/en</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://snd.gu.se/sv</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><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/sp.spraakbanken.gu.se-shibboleth.xml b/swamid-2.0/sp.spraakbanken.gu.se-shibboleth.xml
index 6c3b9a97..16a95b12 100644
--- a/swamid-2.0/sp.spraakbanken.gu.se-shibboleth.xml
+++ b/swamid-2.0/sp.spraakbanken.gu.se-shibboleth.xml
@@ -111,27 +111,27 @@
       <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="sv">Språkbanken</md:OrganizationName>
     <md:OrganizationName xml:lang="en">Språkbanken</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Språkbanken</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Språkbanken</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="sv">https://spraakbanken.gu.se/swe/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="en">https://spraakbanken.gu.se/eng/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
+  </md:Organization><md:ContactPerson contactType="administrative">
     <md:GivenName>Lars</md:GivenName>
     <md:SurName>Borin</md:SurName>
     <md:EmailAddress>mailto:sb-info@svenska.gu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:GivenName>Carl-Johan</md:GivenName>
     <md:SurName>Schenström</md:SurName>
     <md:EmailAddress>mailto:sb-sysadmin@svenska.gu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
+  </md:ContactPerson><md:ContactPerson contactType="support">
     <md:GivenName>Carl-Johan</md:GivenName>
     <md:SurName>Schenström</md:SurName>
     <md:EmailAddress>mailto:sb-sysadmin@svenska.gu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/sp.sprakochfolkminnen.se.xml b/swamid-2.0/sp.sprakochfolkminnen.se.xml
index 12ff60bd..f99d1e8d 100644
--- a/swamid-2.0/sp.sprakochfolkminnen.se.xml
+++ b/swamid-2.0/sp.sprakochfolkminnen.se.xml
@@ -42,17 +42,17 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp.sprakochfolkminnen.se/simplesaml/module.php/saml/sp/saml2-acs.php/federated" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp.sprakochfolkminnen.se/simplesaml/module.php/saml/sp/saml1-acs.php/federated/artifact" index="3"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Institute for Language and Folklore</md:OrganizationName>
     <md:OrganizationName xml:lang="sv">Institutet för språk och folkminnen</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Institute for Language and Folklore</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="sv">Institutet för språk och folkminnen</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.sprakochfolkminnen.se/</md:OrganizationURL>
     <md:OrganizationURL xml:lang="sv">https://www.sprakochfolkminnen.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:GivenName>Magnus</md:GivenName>
     <md:SurName>Ahltorp</md:SurName>
     <md:EmailAddress>mailto:magnus.ahltorp@sprakochfolkminnen.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/sp.swamid.se-shibboleth.xml b/swamid-2.0/sp.swamid.se-shibboleth.xml
index b81a6001..9495b298 100644
--- a/swamid-2.0/sp.swamid.se-shibboleth.xml
+++ b/swamid-2.0/sp.swamid.se-shibboleth.xml
@@ -117,8 +117,8 @@ oAUJwZp3x5rWpywOLd3MMr2hxEi/ZK4uq//9eZv/pTEhWrI3fSqFkg6LXo2iub8=
       <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:ContactPerson contactType="technical">
+  
+<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/sp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/sp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml
index 1ed7aa77..97ba15ab 100644
--- a/swamid-2.0/sp.sweclarin.se-sp-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/sp.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://sp.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://sp.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/spadfs.it.gu.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/spadfs.it.gu.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 2d4f457d..a8d2d3d0 100644
--- a/swamid-2.0/spadfs.it.gu.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/spadfs.it.gu.se-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -41,14 +41,14 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://spadfs.it.gu.se/simplesaml/module.php/saml/sp/saml2-acs.php/sharepoint" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://spadfs.it.gu.se/simplesaml/module.php/saml/sp/saml1-acs.php/sharepoint/artifact" index="3"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">GU</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Göteborgs universitet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.gu.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:GivenName>Tobias</md:GivenName>
     <md:SurName>Galeus</md:SurName>
     <md:EmailAddress>mailto:tobias.galeus@gu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md: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.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
new file mode 100644
index 00000000..955b1f53
--- /dev/null
+++ b/swamid-2.0/sso.uat.skolverket.sonet.com.au-module.php-saml-sp-metadata.php-sp1.xml
@@ -0,0 +1,22 @@
+<?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.uat.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:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.uat.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.uat.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.uat.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.uat.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.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:EntityDescriptor>
diff --git a/swamid-2.0/staging-us.cloudmore.com-shibboleth.xml b/swamid-2.0/staging-us.cloudmore.com-shibboleth.xml
index 5c3e9161..fedf87fc 100644
--- a/swamid-2.0/staging-us.cloudmore.com-shibboleth.xml
+++ b/swamid-2.0/staging-us.cloudmore.com-shibboleth.xml
@@ -93,12 +93,12 @@ LAkq68U=
       <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/staging.cloudmore.com-shibboleth.xml b/swamid-2.0/staging.cloudmore.com-shibboleth.xml
index fe8fae5f..796babd2 100644
--- a/swamid-2.0/staging.cloudmore.com-shibboleth.xml
+++ b/swamid-2.0/staging.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/stillalive.its.umu.se-shibboleth.xml b/swamid-2.0/stillalive.its.umu.se-shibboleth.xml
index acf876c5..03c977bc 100644
--- a/swamid-2.0/stillalive.its.umu.se-shibboleth.xml
+++ b/swamid-2.0/stillalive.its.umu.se-shibboleth.xml
@@ -117,9 +117,9 @@ yx3zfAlNffTw4SajmfXc1Jy4aELtZzqzOa/wpPgi54fXgmVv040=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://stillalive.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://stillalive.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <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/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.integrationstest.ladok.se-student-sp.xml b/swamid-2.0/student.integrationstest.ladok.se-student-sp.xml
index 148cd660..73c79346 100644
--- a/swamid-2.0/student.integrationstest.ladok.se-student-sp.xml
+++ b/swamid-2.0/student.integrationstest.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.integrationstest.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.integrationstest.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.mit-integration.ladok.se-student-sp.xml b/swamid-2.0/student.mit-integration.ladok.se-student-sp.xml
index dc4a6d5c..d504d09c 100644
--- a/swamid-2.0/student.mit-integration.ladok.se-student-sp.xml
+++ b/swamid-2.0/student.mit-integration.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-integration.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-integration.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.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.test.ladok.se-student-sp.xml b/swamid-2.0/student.test.ladok.se-student-sp.xml
index 4057f2fd..8af8e07d 100644
--- a/swamid-2.0/student.test.ladok.se-student-sp.xml
+++ b/swamid-2.0/student.test.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.test.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.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/student.utb2.ladok.se-student-sp.xml b/swamid-2.0/student.utb2.ladok.se-student-sp.xml
index f036ef2a..102ecfcb 100644
--- a/swamid-2.0/student.utb2.ladok.se-student-sp.xml
+++ b/swamid-2.0/student.utb2.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.utb2.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.utb2.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/student.verifiering1.ladok.se-student-sp.xml b/swamid-2.0/student.verifiering1.ladok.se-student-sp.xml
index e8baa0e4..0b7e317f 100644
--- a/swamid-2.0/student.verifiering1.ladok.se-student-sp.xml
+++ b/swamid-2.0/student.verifiering1.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.verifiering1.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.verifiering1.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.verifiering3.ladok.se-student-sp.xml b/swamid-2.0/student.verifiering3.ladok.se-student-sp.xml
index 4ccc4ddd..f6612d5e 100644
--- a/swamid-2.0/student.verifiering3.ladok.se-student-sp.xml
+++ b/swamid-2.0/student.verifiering3.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.verifiering3.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://student.verifiering3.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/studium.uu.se-studium.xml b/swamid-2.0/studium.uu.se-studium.xml
index 22cc7119..8e2128d7 100644
--- a/swamid-2.0/studium.uu.se-studium.xml
+++ b/swamid-2.0/studium.uu.se-studium.xml
@@ -75,9 +75,9 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://studium.uu.se/auth-saml/saml/SSO/alias/_122_1" index="0" isDefault="true"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://studium.uu.se/auth-saml/saml/SSO/alias/_122_1" index="1"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:Company>Uppsala universitet</md:Company>
     <md:SurName>Studium</md:SurName>
     <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/sunet.instructure.com-saml2.xml b/swamid-2.0/sunet.instructure.com-saml2.xml
index b60adf34..88ef027f 100644
--- a/swamid-2.0/sunet.instructure.com-saml2.xml
+++ b/swamid-2.0/sunet.instructure.com-saml2.xml
@@ -96,8 +96,8 @@ BN+f6kyYZ9ztdvueX8SUp5T4s40=</dsig:X509Certificate>
       <md:RequestedAttribute Name="urn:oid:2.5.4.42" FriendlyName="givenName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<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/swamid-2.grandid.com-module.php-saml-sp-metadata.php-gu-swamid-draftit.xml b/swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-gu-swamid-draftit.xml
index 86ba72e4..838a22ca 100644
--- a/swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-gu-swamid-draftit.xml
+++ b/swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-gu-swamid-draftit.xml
@@ -36,13 +36,13 @@
       <md:RequestedAttribute Name="mail" isRequired="true"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="sv">Svensk E-identitet SP</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Svensk E-identitet AB</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.e-identitet.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:GivenName>Svensk E-identitet / GrandID Support</md:GivenName>
     <md:EmailAddress>mailto:support@grandid.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-proxysp-swamid-btj.xml b/swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-proxysp-swamid-btj.xml
index 77e0c264..7e84c764 100644
--- a/swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-proxysp-swamid-btj.xml
+++ b/swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-proxysp-swamid-btj.xml
@@ -45,16 +45,16 @@
       <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="sv">Svensk E-identitet SP</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Svensk E-identitet AB</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.e-identitet.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
+  </md:Organization><md:ContactPerson contactType="administrative">
     <md:EmailAddress>mailto:btjbc@btj.se.</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:GivenName>Svensk E-identitet / GrandID Support</md:GivenName>
     <md:EmailAddress>mailto:support@grandid.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/swamid.grandid.com-simplesaml-module.php-saml-sp-metadata.php-retendosp.xml b/swamid-2.0/swamid.grandid.com-simplesaml-module.php-saml-sp-metadata.php-retendosp.xml
index 90114d8c..6bf445bb 100644
--- a/swamid-2.0/swamid.grandid.com-simplesaml-module.php-saml-sp-metadata.php-retendosp.xml
+++ b/swamid-2.0/swamid.grandid.com-simplesaml-module.php-saml-sp-metadata.php-retendosp.xml
@@ -35,9 +35,9 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://swamid.grandid.com/simplesaml/module.php/saml/sp/saml2-acs.php/retendosp" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://swamid.grandid.com/simplesaml/module.php/saml/sp/saml1-acs.php/retendosp/artifact" index="3"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+<md:Organization>
     <md:OrganizationName xml:lang="sv">Retendosp prod</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Retendosp prod</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.e-identitet.se/</md:OrganizationURL>
-  </md:Organization>
-</md:EntityDescriptor>
+  </md:Organization></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/swamid2.shh.se-idp-shibboleth.xml b/swamid-2.0/swamid2.shh.se-idp-shibboleth.xml
index 0e185710..27417596 100644
--- a/swamid-2.0/swamid2.shh.se-idp-shibboleth.xml
+++ b/swamid-2.0/swamid2.shh.se-idp-shibboleth.xml
@@ -97,28 +97,28 @@ URk4QC3n4Dibk1dSDRkM5RwF8LLd5TWSV0zwmjFUHr1iLc8/MXsscA==</ds:X509Certificate>
     <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">SHH</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Sophiahemmet Högskola</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Sophiahemmet University</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.shh.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>Sophiahemmet University</Company>
     <SurName>Sophiahemmet IT</SurName>
     <EmailAddress>mailto:itsupport@sophiahemmet.se</EmailAddress>
     <TelephoneNumber>+46 8 406 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>Sophiahemmet University</Company>
     <SurName>Sophiahemmet IT</SurName>
     <EmailAddress>mailto:itsupport@sophiahemmet.se</EmailAddress>
     <TelephoneNumber>+46 8 406 2525</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>Sophiahemmet University</Company>
     <SurName>Sophiahemmet IT</SurName>
     <EmailAddress>mailto:itsupport@sophiahemmet.se</EmailAddress>
     <TelephoneNumber>+46 8 406 2525</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/taylor-francis-ra21.mnt.se-shibboleth.xml b/swamid-2.0/taylor-francis-ra21.mnt.se-shibboleth.xml
index 43f2a6ec..98abf852 100644
--- a/swamid-2.0/taylor-francis-ra21.mnt.se-shibboleth.xml
+++ b/swamid-2.0/taylor-francis-ra21.mnt.se-shibboleth.xml
@@ -78,14 +78,14 @@ meJi/RmkoeATtUB3uah+Xax+Nx0Jil2AYw==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://taylor-francis-ra21.mnt.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://taylor-francis-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/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
index 0ed38a14..2ba5199f 100644
--- a/swamid-2.0/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
@@ -41,9 +41,9 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://tcs-escience-portal.terena.org/simplesamlphp/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://tcs-escience-portal.terena.org/simplesamlphp/module.php/saml/sp/saml2-acs.php/default-sp" index="4"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>UvT</md:GivenName>
     <md:SurName>LIS Unix</md:SurName>
     <md:EmailAddress>mailto:na@example.org</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md: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/tcs-personal-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/tcs-personal-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
index ca63ce31..b551fe94 100644
--- a/swamid-2.0/tcs-personal-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/tcs-personal-portal.terena.org-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-personal-portal.terena.org/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-personal-portal.terena.org/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">TERENA</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">TERENA</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.terena.org/tcs</md:OrganizationURL>
-  </md:Organization>
-</md:EntityDescriptor>
+  </md:Organization></md:EntityDescriptor>
diff --git a/swamid-2.0/tcs-personal.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-2.0/tcs-personal.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
index b9df6129..e8c6e813 100644
--- a/swamid-2.0/tcs-personal.sunet.se-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
+++ b/swamid-2.0/tcs-personal.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-personal.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-personal.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/te-id.statenssc.se-adfs-services-trust.xml b/swamid-2.0/te-id.statenssc.se-adfs-services-trust.xml
index 57b5cc93..17b7359b 100644
--- a/swamid-2.0/te-id.statenssc.se-adfs-services-trust.xml
+++ b/swamid-2.0/te-id.statenssc.se-adfs-services-trust.xml
@@ -66,26 +66,26 @@
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://te-id.statenssc.se/adfs/ls/" index="1"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://te-id.statenssc.se/adfs/ls/" index="2"/>
   </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">Statens Servicecenter</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Ekonomi- och lönetjänster för anställda på svenska myndigheter (test)</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Accounting and payroll services for employees at Swedish authorities (test)</OrganizationDisplayName>
     <OrganizationURL xml:lang="sv">http://www.statenssc.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>Johan</GivenName>
     <SurName>Göthberg</SurName>
     <EmailAddress>mailto:johan.gothberg@statenssc.se</EmailAddress>
     <TelephoneNumber>0771456000</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">
     <SurName>Johan Larsson</SurName>
     <EmailAddress>mailto:johan.larsson@statenssc.se</EmailAddress>
     <TelephoneNumber>+46 10-456 03 10</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">
     <SurName>Lars Forsgren</SurName>
     <EmailAddress>mailto:lars.forsgren@tieto.com</EmailAddress>
     <TelephoneNumber>+46 10-481 01 97</TelephoneNumber>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/tentaadmin-demo.test.umu.se-shibboleth.xml b/swamid-2.0/tentaadmin-demo.test.umu.se-shibboleth.xml
index 2449336b..897aa72e 100644
--- a/swamid-2.0/tentaadmin-demo.test.umu.se-shibboleth.xml
+++ b/swamid-2.0/tentaadmin-demo.test.umu.se-shibboleth.xml
@@ -91,9 +91,9 @@ k0b3OPSaUvVNsZGwMOZ6RUXc9dK+jXX+Xx7HoQYPlfRtBtF+e+U1alxrQXCmxF+f
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://tentaadmin-demo.test.umu.se/Shibboleth.sso/SAML2/ECP" index="9"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tentaadmin-demo.test.umu.se/Shibboleth.sso/SAML2/POST" index="10"/>
   </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/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/tentaadmin.uhr.se-shibboleth.xml b/swamid-2.0/tentaadmin.uhr.se-shibboleth.xml
index f7c3f78d..5f9b06d1 100644
--- a/swamid-2.0/tentaadmin.uhr.se-shibboleth.xml
+++ b/swamid-2.0/tentaadmin.uhr.se-shibboleth.xml
@@ -86,9 +86,9 @@ gA74GRgPQ3FGnqF2PkasBH+5Vkxk2rTdAroEO3WXRBOsk6JgO3lB/QY8x/lOfg==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tentaadmin.uhr.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://tentaadmin.uhr.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </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/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-du.hr.evry.se-shibboleth.xml b/swamid-2.0/test-du.hr.evry.se-shibboleth.xml
index 7a76fc75..20f9d043 100644
--- a/swamid-2.0/test-du.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/test-du.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-hb.hr.evry.se-shibboleth.xml b/swamid-2.0/test-hb.hr.evry.se-shibboleth.xml
index 4510cb53..43b3c1b2 100644
--- a/swamid-2.0/test-hb.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/test-hb.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-hh.hr.evry.se-shibboleth.xml b/swamid-2.0/test-hh.hr.evry.se-shibboleth.xml
index ac5439b7..efc79410 100644
--- a/swamid-2.0/test-hh.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/test-hh.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-his.hr.evry.se-shibboleth.xml b/swamid-2.0/test-his.hr.evry.se-shibboleth.xml
index 884bf875..c9014f8b 100644
--- a/swamid-2.0/test-his.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/test-his.hr.evry.se-shibboleth.xml
@@ -59,14 +59,14 @@ tFtOy/01MRdVsQQc8spn2VX6WxZsXCj1HNHrT91JARliVf+ztavCB3DOxSE=
       <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/test-hkr.hr.evry.se-shibboleth.xml b/swamid-2.0/test-hkr.hr.evry.se-shibboleth.xml
index f1a44448..dc223596 100644
--- a/swamid-2.0/test-hkr.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/test-hkr.hr.evry.se-shibboleth.xml
@@ -59,14 +59,14 @@ tFtOy/01MRdVsQQc8spn2VX6WxZsXCj1HNHrT91JARliVf+ztavCB3DOxSE=
       <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/test-kau.hr.evry.se-shibboleth.xml b/swamid-2.0/test-kau.hr.evry.se-shibboleth.xml
index 6d6d0bc9..9f56a65e 100644
--- a/swamid-2.0/test-kau.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/test-kau.hr.evry.se-shibboleth.xml
@@ -66,14 +66,14 @@ tFtOy/01MRdVsQQc8spn2VX6WxZsXCj1HNHrT91JARliVf+ztavCB3DOxSE=
       <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/test-ki.hr.evry.se-shibboleth.xml b/swamid-2.0/test-ki.hr.evry.se-shibboleth.xml
index 0241c9fe..0a9737f7 100644
--- a/swamid-2.0/test-ki.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/test-ki.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-ki.pingpong.net-shibboleth.xml b/swamid-2.0/test-ki.pingpong.net-shibboleth.xml
index 3be8d2a9..7f4689b1 100644
--- a/swamid-2.0/test-ki.pingpong.net-shibboleth.xml
+++ b/swamid-2.0/test-ki.pingpong.net-shibboleth.xml
@@ -50,9 +50,9 @@ kRz90uqHpg==
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test-ki.pingpong.net/Shibboleth.sso/SLO/Redirect"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test-ki.pingpong.net/Shibboleth.sso/SAML2/POST" index="0"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">KI</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.ki.se</md:OrganizationURL>
-  </md:Organization>
-</md:EntityDescriptor>
+  </md:Organization></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-lnu.hr.evry.se-shibboleth.xml b/swamid-2.0/test-lnu.hr.evry.se-shibboleth.xml
index c04a3bf8..55efee33 100644
--- a/swamid-2.0/test-lnu.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/test-lnu.hr.evry.se-shibboleth.xml
@@ -73,14 +73,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-mah.hr.evry.se-shibboleth.xml b/swamid-2.0/test-mah.hr.evry.se-shibboleth.xml
index 545ff280..0c140153 100644
--- a/swamid-2.0/test-mah.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/test-mah.hr.evry.se-shibboleth.xml
@@ -59,14 +59,14 @@ tFtOy/01MRdVsQQc8spn2VX6WxZsXCj1HNHrT91JARliVf+ztavCB3DOxSE=
       <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/test-mdh.hr.evry.se-shibboleth.xml b/swamid-2.0/test-mdh.hr.evry.se-shibboleth.xml
index df67fa60..d77db5bf 100644
--- a/swamid-2.0/test-mdh.hr.evry.se-shibboleth.xml
+++ b/swamid-2.0/test-mdh.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-portfolio.bmc.lu.se-mahara.xml b/swamid-2.0/test-portfolio.bmc.lu.se-mahara.xml
index 7421dc97..c36775c2 100644
--- a/swamid-2.0/test-portfolio.bmc.lu.se-mahara.xml
+++ b/swamid-2.0/test-portfolio.bmc.lu.se-mahara.xml
@@ -41,19 +41,19 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test-portfolio.bmc.lu.se/auth/saml/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://test-portfolio.bmc.lu.se/auth/saml/sp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
   </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>Niklas</md:GivenName>
     <md:SurName>Frost</md:SurName>
     <md:EmailAddress>mailto:niklas.frost@med.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/test.account.hj.se-adfs-services-trust.xml b/swamid-2.0/test.account.hj.se-adfs-services-trust.xml
index b9c1d38b..b999585b 100644
--- a/swamid-2.0/test.account.hj.se-adfs-services-trust.xml
+++ b/swamid-2.0/test.account.hj.se-adfs-services-trust.xml
@@ -54,9 +54,9 @@
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.account.hj.se/adfs/ls/" index="1"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.account.hj.se/adfs/ls/" index="2"/>
   </SPSSODescriptor>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  
+<ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <GivenName>Joakim</GivenName>
     <SurName>Danielsson</SurName>
     <EmailAddress>mailto:swamid@ju.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/test.bils.se-auth-metadata.xml b/swamid-2.0/test.bils.se-auth-metadata.xml
index 170e2694..5687539e 100644
--- a/swamid-2.0/test.bils.se-auth-metadata.xml
+++ b/swamid-2.0/test.bils.se-auth-metadata.xml
@@ -94,14 +94,14 @@
     <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.bils.se/auth/logout"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.bils.se/auth/response" index="1"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Bioinformatics Infrastructure for Life Sciences</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Bioinformatics Infrastructure for Life Sciences</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.bils.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:GivenName>Frédéric</md:GivenName>
     <md:SurName>Haziza</md:SurName>
     <md:EmailAddress>mailto:daz@bils.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/test.itslearning.com.xml b/swamid-2.0/test.itslearning.com.xml
index 3dd056e1..6251db6d 100644
--- a/swamid-2.0/test.itslearning.com.xml
+++ b/swamid-2.0/test.itslearning.com.xml
@@ -77,15 +77,15 @@ L0Gxkp4Wyq0nkpjQ4E2v9nFsPiXf4kL8Cc7Oa87n</ds:X509Certificate>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.itsltest.com/elogin/AssertionConsumerService.aspx" index="0" 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">itslearning (test)</OrganizationName>
     <OrganizationDisplayName xml:lang="en">itslearning (test)</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.itslearning.eu</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xml:lang="en" contactType="technical">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xml:lang="en" contactType="technical">
     <EmailAddress>mailto:support@itslearning.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xml:lang="en" contactType="support">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xml:lang="en" contactType="support">
     <EmailAddress>mailto:support@itslearning.com</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/test.lararlyftet-validering.se-shibboleth.xml b/swamid-2.0/test.lararlyftet-validering.se-shibboleth.xml
index 5ec2166f..224e54f6 100644
--- a/swamid-2.0/test.lararlyftet-validering.se-shibboleth.xml
+++ b/swamid-2.0/test.lararlyftet-validering.se-shibboleth.xml
@@ -107,9 +107,9 @@ BwquFopAQg==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://acc.lararlyftet-validering.se/Shibboleth.sso/SAML/POST" index="10"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://acc.lararlyftet-validering.se/Shibboleth.sso/SAML/Artifact" index="11"/>
   </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/test.play.bth.se.xml b/swamid-2.0/test.play.bth.se.xml
index 7b354f05..7d3e9bd4 100644
--- a/swamid-2.0/test.play.bth.se.xml
+++ b/swamid-2.0/test.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://test.play.bth.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">BTH (TEST)</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">BTH (TEST)</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://test.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/test.play.hv.se.xml b/swamid-2.0/test.play.hv.se.xml
index 3b500a6c..fcf1f252 100644
--- a/swamid-2.0/test.play.hv.se.xml
+++ b/swamid-2.0/test.play.hv.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://test.play.hv.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">HV Play (Test)</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">HV Play (Test)</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://test.play.hv.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/test.play.mdh.se.xml b/swamid-2.0/test.play.mdh.se.xml
index 1429798f..08de414f 100644
--- a/swamid-2.0/test.play.mdh.se.xml
+++ b/swamid-2.0/test.play.mdh.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://test.play.mdh.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">Mälardalens Högskola (TEST)</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Mälardalens Högskola (TEST)</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://test.play.mdh.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/test.play.rkh.se.xml b/swamid-2.0/test.play.rkh.se.xml
index 471f35f1..05458112 100644
--- a/swamid-2.0/test.play.rkh.se.xml
+++ b/swamid-2.0/test.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://test.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://test.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/test.scalable-learning.com.xml b/swamid-2.0/test.scalable-learning.com.xml
index bfb3fa27..4f4fba2b 100644
--- a/swamid-2.0/test.scalable-learning.com.xml
+++ b/swamid-2.0/test.scalable-learning.com.xml
@@ -69,21 +69,21 @@ b4Y=
       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" 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">Scalable Learning</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Scalable Learning</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://test.scalable-learning.com</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </md:Organization><md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>ScalableLearning</Company>
     <EmailAddress>mailto:support@scalable-learning.com</EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+  </md:ContactPerson><md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>ScalableLearning</Company>
     <EmailAddress>mailto:support@scalable-learning.com</EmailAddress>
-  </md:ContactPerson>
-  <md: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">
+  </md:ContactPerson><md: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>Security Response Team</GivenName>
     <EmailAddress>mailto:support@scalable-learning.com</EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/test.valda.i.uhr.se-shibbboleth.xml b/swamid-2.0/test.valda.i.uhr.se-shibbboleth.xml
index 97fa1709..5ddbcd96 100644
--- a/swamid-2.0/test.valda.i.uhr.se-shibbboleth.xml
+++ b/swamid-2.0/test.valda.i.uhr.se-shibbboleth.xml
@@ -90,9 +90,9 @@ BwquFopAQg==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.valda.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.valda.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:valdasupport@uhr.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/test.valda.uhr.se-shibboleth.xml b/swamid-2.0/test.valda.uhr.se-shibboleth.xml
index 132b3e14..3195f8cb 100644
--- a/swamid-2.0/test.valda.uhr.se-shibboleth.xml
+++ b/swamid-2.0/test.valda.uhr.se-shibboleth.xml
@@ -90,9 +90,9 @@ BwquFopAQg==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.valda.uhr.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.valda.uhr.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>Olivier</md:GivenName>
     <md:SurName>Brotons</md:SurName>
     <md:EmailAddress>mailto:valdasupport@uhr.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/testshib.msacademicverify.com-shibboleth-sp.xml b/swamid-2.0/testshib.msacademicverify.com-shibboleth-sp.xml
index bf2df033..6eb85fd8 100644
--- a/swamid-2.0/testshib.msacademicverify.com-shibboleth-sp.xml
+++ b/swamid-2.0/testshib.msacademicverify.com-shibboleth-sp.xml
@@ -51,17 +51,17 @@ wWE+vceD2r7oFUYHr1E07cyX20HwNU1LL3TthPaNhs7M2ImLlYHapw==
       <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>Gerry O'Brien</GivenName>
     <EmailAddress>mailto:Gerry.OBrien@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>
-</md:EntityDescriptor>
+  </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/tsidp1.test.bth.se-idp-shibboleth.xml b/swamid-2.0/tsidp1.test.bth.se-idp-shibboleth.xml
index ee18b159..1761948b 100644
--- a/swamid-2.0/tsidp1.test.bth.se-idp-shibboleth.xml
+++ b/swamid-2.0/tsidp1.test.bth.se-idp-shibboleth.xml
@@ -206,32 +206,32 @@ qW+WsHaRP1g=
     </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://tsidp1.test.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 (MFA-TEST)</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Blekinge Institute of Technology (MFA-TEST)</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/tta-portal.misc.kth.se-shibboleth.xml b/swamid-2.0/tta-portal.misc.kth.se-shibboleth.xml
index 7f1b8bcd..fb8bba65 100644
--- a/swamid-2.0/tta-portal.misc.kth.se-shibboleth.xml
+++ b/swamid-2.0/tta-portal.misc.kth.se-shibboleth.xml
@@ -78,18 +78,18 @@ rGd2vkc4pVut0uwvGCCB44WTILL2gw==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://tta-portal.misc.kth.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://tta-portal.misc.kth.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">TTA - Technology Transfer Alliance</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">TTA - Technology Transfer Alliance</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://tta-portal.misc.kth.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
+  </md:Organization><md:ContactPerson contactType="support">
     <md:GivenName>Authentication Support</md:GivenName>
     <md:EmailAddress>mailto:TechnologyTransferAlliance@gmail.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
+  </md:ContactPerson><md:ContactPerson contactType="administrative">
     <md:GivenName>Technology Transfer Alliance</md:GivenName>
     <md:SurName>Administrator</md:SurName>
     <md:EmailAddress>mailto:TechnologyTransferAlliance@gmail.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
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/umdac-humpdac.ad.umu.se-shibboleth.xml b/swamid-2.0/umdac-humpdac.ad.umu.se-shibboleth.xml
index facb2572..0ea909d8 100644
--- a/swamid-2.0/umdac-humpdac.ad.umu.se-shibboleth.xml
+++ b/swamid-2.0/umdac-humpdac.ad.umu.se-shibboleth.xml
@@ -15,15 +15,15 @@
     </KeyDescriptor>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://umdac-humpdac.ad.umu.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">UU</OrganizationName>
     <OrganizationDisplayName xml:lang="en">Umeå University</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.umu.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>UMDAC</Company>
     <GivenName>Tommy</GivenName>
     <SurName>Larsson</SurName>
     <EmailAddress>mailto:tommy.larsson@umdac.umu.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/uppsala-test.blackboard.com-lms.xml b/swamid-2.0/uppsala-test.blackboard.com-lms.xml
index 3d959644..f255e3e8 100644
--- a/swamid-2.0/uppsala-test.blackboard.com-lms.xml
+++ b/swamid-2.0/uppsala-test.blackboard.com-lms.xml
@@ -75,9 +75,9 @@
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uppsala-test.blackboard.com/auth-saml/saml/SSO/alias/_102_1" index="0" isDefault="true"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uppsala-test.blackboard.com/auth-saml/saml/SSO/alias/_102_1" 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/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/uraccess.net-shibboleth.xml b/swamid-2.0/uraccess.net-shibboleth.xml
index baeeb820..8ee61bd9 100644
--- a/swamid-2.0/uraccess.net-shibboleth.xml
+++ b/swamid-2.0/uraccess.net-shibboleth.xml
@@ -91,12 +91,12 @@ RXmDTYIhHnjv+Sc7dzCbIA==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://uraccess.net/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://uraccess.net/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="support">
+  
+  
+<md:ContactPerson contactType="support">
     <md:EmailAddress>mailto:onsite@ur.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:GivenName>Michael</md:GivenName>
     <md:SurName>Nilsson</md:SurName>
     <md:EmailAddress>mailto:Michael.Nilsson@ur.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/us.cloudmore.com-shibboleth.xml b/swamid-2.0/us.cloudmore.com-shibboleth.xml
index 3ca39d07..dd9e8d02 100644
--- a/swamid-2.0/us.cloudmore.com-shibboleth.xml
+++ b/swamid-2.0/us.cloudmore.com-shibboleth.xml
@@ -93,12 +93,12 @@ LAkq68U=
       <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/utmanande.math.su.se-shibboleth.xml b/swamid-2.0/utmanande.math.su.se-shibboleth.xml
index 91e4ece7..c1ece8b8 100644
--- a/swamid-2.0/utmanande.math.su.se-shibboleth.xml
+++ b/swamid-2.0/utmanande.math.su.se-shibboleth.xml
@@ -71,8 +71,8 @@ cltjAaJBgU+QoDEuKsQtzVwmR/JfWYaVaMDXCh+QwOgvP3MIq8pA
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://utmanande.math.su.se/Shibboleth.sso/SAML2/ECP" index="9"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://utmanande.math.su.se/Shibboleth.sso/SAML2/POST" index="10"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
+  
+<md:ContactPerson contactType="administrative">
     <md:SurName>Albin Niva Printz</md:SurName>
     <md:EmailAddress>mailto:albin.printz@math.su.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/valda.uhr.se-shibboleth.xml b/swamid-2.0/valda.uhr.se-shibboleth.xml
index e5c17a9a..f45a6e0c 100644
--- a/swamid-2.0/valda.uhr.se-shibboleth.xml
+++ b/swamid-2.0/valda.uhr.se-shibboleth.xml
@@ -95,9 +95,9 @@ RrcgAwWR573F+C6Cqrt89uDpyQ8ZM2Z+LZdIvrhBYV/lO7Dk9uZF2d9f7ew48DeA
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://valda.uhr.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://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/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/verify-l.myunidays.com-shibboleth.xml b/swamid-2.0/verify-l.myunidays.com-shibboleth.xml
index b3caf01a..1810bef5 100644
--- a/swamid-2.0/verify-l.myunidays.com-shibboleth.xml
+++ b/swamid-2.0/verify-l.myunidays.com-shibboleth.xml
@@ -103,26 +103,26 @@ xmBjp1ntxjW8jWQiW/3pb5t/HODL79ntP17sTv4kT8EURtMRgYxttfreDdg=
       <md: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"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
+  
+  
+  
+  
+<md:ContactPerson contactType="administrative">
     <md:Company>UNiDAYS</md:Company>
     <md:GivenName>Andrew</md:GivenName>
     <md:SurName>Bullock</md:SurName>
     <md:EmailAddress>mailto:andrew.bullock@myunidays.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:Company>UNiDAYS</md:Company>
     <md:GivenName>Alan</md:GivenName>
     <md:SurName>Buxey</md:SurName>
     <md:EmailAddress>mailto:alan.buxey@myunidays.com</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
+  </md:ContactPerson><md:ContactPerson contactType="support">
     <md:Company>UNiDAYS</md:Company>
     <md:GivenName>Alan</md:GivenName>
     <md:SurName>Buxey</md:SurName>
     <md:EmailAddress>mailto:alan.buxey@myunidays.com</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>SAML Security Response Team</md:GivenName>
     <md:EmailAddress>mailto:shibadmin@myunidays.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/verify.studentbeans.com-shibboleth.xml b/swamid-2.0/verify.studentbeans.com-shibboleth.xml
index 5e10868e..ac79df85 100644
--- a/swamid-2.0/verify.studentbeans.com-shibboleth.xml
+++ b/swamid-2.0/verify.studentbeans.com-shibboleth.xml
@@ -91,16 +91,16 @@ UKG+a99pFdmiJhaVmr6ppycpR94IcDJb+8Px5A==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://verify.studentbeans.com/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">The Beans Group</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">The Beans Group</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="cs">The Beans Group</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.thebeansgroup.com</md:OrganizationURL>
     <md:OrganizationURL xml:lang="cs">http://www.thebeansgroup.com</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:GivenName>William</md:GivenName>
     <md:SurName>Harris</md:SurName>
     <md:EmailAddress>mailto:william@thebeansgroup.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/vfu-dev.su.se-shibboleth.sso.xml b/swamid-2.0/vfu-dev.su.se-shibboleth.sso.xml
index 549cc0ec..fc8d34e6 100644
--- a/swamid-2.0/vfu-dev.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/vfu-dev.su.se-shibboleth.sso.xml
@@ -100,8 +100,8 @@ OfgfAaitGQwEniw6a8XAyH8IJbFaDvS3zSLWnrA=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vfu-dev.su.se/Shibboleth.sso/SAML2/Artifact" index="8"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vfu-dev.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/vfu-test.su.se-shibboleth.sso.xml b/swamid-2.0/vfu-test.su.se-shibboleth.sso.xml
index ba355ed0..8100ba24 100644
--- a/swamid-2.0/vfu-test.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/vfu-test.su.se-shibboleth.sso.xml
@@ -100,8 +100,8 @@ XOl0tx98AnNRgDTOuRoPtUa7Bg8w4puwklhK+gg+X01kZA==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vfu-test.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vfu-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/vfu.su.se-shibboleth.sso.xml b/swamid-2.0/vfu.su.se-shibboleth.sso.xml
index c17b623f..f8387af1 100644
--- a/swamid-2.0/vfu.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/vfu.su.se-shibboleth.sso.xml
@@ -71,8 +71,8 @@ ZbIlfQJbU+IsF+PBKYkQ9oGeHIBu0E6lRYjrmIFz1n176w==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vfu.su.se/Shibboleth.sso/SAML2/Artifact" index="9"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vfu.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/vfusyd-dev.su.se-shibboleth.sso.xml b/swamid-2.0/vfusyd-dev.su.se-shibboleth.sso.xml
index c69471b3..526592ec 100644
--- a/swamid-2.0/vfusyd-dev.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/vfusyd-dev.su.se-shibboleth.sso.xml
@@ -104,8 +104,8 @@ WBDYqdoEV/JWoX8elhgj/eI4j2DiKfZkfPQhZIkJBtgZamfQkW33ttzLp0Nzh/Ck
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vfusyd-dev.su.se/Shibboleth.sso/SAML2/Artifact" index="8"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vfusyd-dev.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/vfusyd-test.su.se-shibboleth.sso.xml b/swamid-2.0/vfusyd-test.su.se-shibboleth.sso.xml
index cce08901..2892cf7e 100644
--- a/swamid-2.0/vfusyd-test.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/vfusyd-test.su.se-shibboleth.sso.xml
@@ -104,8 +104,8 @@ b6XhptNS5kSIVoJCgXaUP1Vi/pyzm713Re9wwYT92JDWUgfHPsVXUnQ=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vfusyd-test.su.se/Shibboleth.sso/SAML2/Artifact" index="8"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vfusyd-test.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/vfusyd.su.se-shibboleth.sso.xml b/swamid-2.0/vfusyd.su.se-shibboleth.sso.xml
index 4557efdd..530c7bd2 100644
--- a/swamid-2.0/vfusyd.su.se-shibboleth.sso.xml
+++ b/swamid-2.0/vfusyd.su.se-shibboleth.sso.xml
@@ -98,8 +98,8 @@ XR6xsoeRckHfPU+Ipt5ovuN1xQnJmgvGww1VWgdSwEL0UqFf6Gj6eM4=
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vfusyd.su.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vfusyd.su.se/Shibboleth.sso/SAML2/ECP" index="4"/>
   </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/video.nordu.net.xml b/swamid-2.0/video.nordu.net.xml
index 01721012..b1011a0c 100644
--- a/swamid-2.0/video.nordu.net.xml
+++ b/swamid-2.0/video.nordu.net.xml
@@ -32,13 +32,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://video.nordu.net/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">NORDUnet MediaSpace</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">NORDUnet MediaSpace</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://video.nordu.net</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
+  </md:Organization><md:ContactPerson contactType="technical">
     <md:SurName>NORDUnet</md:SurName>
     <md:EmailAddress>mailto:kaltura@nordu.net</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/webkonto.student.hig.se-shibboleth.xml b/swamid-2.0/webkonto.student.hig.se-shibboleth.xml
index 8e735b99..d69d5b7f 100644
--- a/swamid-2.0/webkonto.student.hig.se-shibboleth.xml
+++ b/swamid-2.0/webkonto.student.hig.se-shibboleth.xml
@@ -66,15 +66,15 @@ mj3ToMT9Iz7u97ghHaP7FQ==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://webkonto.student.hig.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://webkonto.student.hig.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">University of Gävle</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">University of Gävle</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.hig.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
+  </md:Organization><md:ContactPerson contactType="support">
     <md:Company>University of Gävle</md:Company>
     <md:SurName>ITsupport</md:SurName>
     <md:EmailAddress>mailto:itsupport@hig.se</md:EmailAddress>
     <md:TelephoneNumber>+46 26 648880</md:TelephoneNumber>
-  </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.smhi.se-idp-shibboleth.xml b/swamid-2.0/weblogin.smhi.se-idp-shibboleth.xml
index ae67487d..6d8aa04c 100644
--- a/swamid-2.0/weblogin.smhi.se-idp-shibboleth.xml
+++ b/swamid-2.0/weblogin.smhi.se-idp-shibboleth.xml
@@ -119,48 +119,48 @@ kIE+WHmcqr7ZfEfWi17pJAil+nNWp+hZpUw566AbqjWq
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin.smhi.se/idp/profile/SAML2/POST/SSO"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin.smhi.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">SMHI</OrganizationName>
     <OrganizationName xml:lang="sv">SMHI</OrganizationName>
     <OrganizationDisplayName xml:lang="en">SMHI</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="sv">SMHI</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.smhi.se</OrganizationURL>
     <OrganizationURL xml:lang="sv">http://www.smhi.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>SMHI</Company>
     <SurName>Sakib Kicic</SurName>
     <EmailAddress>mailto:sakib.kicic@smhi.se</EmailAddress>
     <TelephoneNumber>+46114958033</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>SMHI</Company>
     <SurName>Peter Magnusson</SurName>
     <EmailAddress>mailto:peter.magnusson@smhi.se</EmailAddress>
     <TelephoneNumber>+46114958547</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>SMHI</Company>
     <SurName>Sakib Kicic</SurName>
     <EmailAddress>mailto:sakib.kicic@smhi.se</EmailAddress>
     <TelephoneNumber>+46114958033</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>SMHI</Company>
     <SurName>Peter Magnusson</SurName>
     <EmailAddress>mailto:peter.magnusson@smhi.se</EmailAddress>
     <TelephoneNumber>+46114958547</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>SMHI</Company>
     <SurName>Sakib Kicic</SurName>
     <EmailAddress>mailto:sakib.kicic@smhi.se</EmailAddress>
     <TelephoneNumber>+46114958033</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>SMHI</Company>
     <SurName>Peter Magnusson</SurName>
     <EmailAddress>mailto:peter.magnusson@smhi.se</EmailAddress>
     <TelephoneNumber>+46114958547</TelephoneNumber>
-  </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 10d6414d..90404063 100644
--- a/swamid-2.0/weblogin.test.uu.se-idp-shibboleth.xml
+++ b/swamid-2.0/weblogin.test.uu.se-idp-shibboleth.xml
@@ -200,14 +200,14 @@ dqPteAxhBzLEflg+
     <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">Uppsala university</OrganizationName>
     <OrganizationDisplayName xml:lang="en">Uppsala University TEST</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.uu.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>Uppsala universitet</Company>
     <SurName>AKKA SAML2</SurName>
     <EmailAddress>mailto:uadm-team_plattform@lists.uu.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml b/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml
index 75609e46..27033a37 100644
--- a/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml
+++ b/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml
@@ -220,30 +220,30 @@ nQPiHsyW3apD4+IJzI2nGQfeL4XO6MPUPVvn+7TiduFaCe+TXJQW
     <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</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>
-  <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/weblogon.ltu.se-shibboleth.xml b/swamid-2.0/weblogon.ltu.se-shibboleth.xml
index f2b3269c..b3abe928 100644
--- a/swamid-2.0/weblogon.ltu.se-shibboleth.xml
+++ b/swamid-2.0/weblogon.ltu.se-shibboleth.xml
@@ -85,26 +85,26 @@ JQ==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://weblogon.ltu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://weblogon.ltu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:Organization>
+  
+  
+  
+  
+<md:Organization>
     <md:OrganizationName xml:lang="en">LTU</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="sv">Luleå tekniska universitet</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Luleå University of Technology</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">http://www.ltu.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
+  </md:Organization><md:ContactPerson contactType="administrative">
     <md:Company>Luleå University of Technology</md:Company>
     <md:SurName>Servicedesk</md:SurName>
     <md:TelephoneNumber>+46 920 491 664</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
+  </md:ContactPerson><md:ContactPerson contactType="technical">
     <md:Company>Luleå University of Technology</md:Company>
     <md:SurName>IT Service/Infrastructure</md:SurName>
     <md:EmailAddress>mailto:its-idp@list.ltu.se</md:EmailAddress>
     <md:TelephoneNumber>+46 920 491 664</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
+  </md:ContactPerson><md:ContactPerson contactType="support">
     <md:Company>Luleå University of Technology</md:Company>
     <md:SurName>Servicedesk</md:SurName>
     <md:TelephoneNumber>+46 920 491 664</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml b/swamid-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml
index 1185c759..f3c88d4b 100644
--- a/swamid-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml
+++ b/swamid-2.0/webproxysrv.uniarts.se-adfs-services-trust.xml
@@ -40,17 +40,17 @@
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://webproxysrv.uniarts.se/adfs/ls/"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://webproxysrv.uniarts.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">Stockholms konstnärliga högskola</OrganizationName>
     <OrganizationName xml:lang="en">Stockholm University of the Arts</OrganizationName>
     <OrganizationDisplayName xml:lang="sv">Stockholms konstnärliga högskola</OrganizationDisplayName>
     <OrganizationDisplayName xml:lang="en">Stockholm University of the Arts</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.uniarts.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>Lars</GivenName>
     <SurName>Lind</SurName>
     <EmailAddress>mailto:itsupport@uniarts.se</EmailAddress>
     <TelephoneNumber>+46(0)849400220</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/webwork2.math.su.se-shibboleth.xml b/swamid-2.0/webwork2.math.su.se-shibboleth.xml
index b88aebd8..6d08e266 100644
--- a/swamid-2.0/webwork2.math.su.se-shibboleth.xml
+++ b/swamid-2.0/webwork2.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://webwork2.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/wikiu.its.uu.se-shibboleth.xml b/swamid-2.0/wikiu.its.uu.se-shibboleth.xml
index 8b9e9c6e..ca516929 100644
--- a/swamid-2.0/wikiu.its.uu.se-shibboleth.xml
+++ b/swamid-2.0/wikiu.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://wikiu.its.uu.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wikiu.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.integrationstest.ladok.se-gui-sp.xml b/swamid-2.0/www.integrationstest.ladok.se-gui-sp.xml
index f504e207..61207a93 100644
--- a/swamid-2.0/www.integrationstest.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.integrationstest.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.integrationstest.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.integrationstest.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.itslearning.com-integrations-samlmetadata-saml2v2-extensions-1.xml b/swamid-2.0/www.itslearning.com-integrations-samlmetadata-saml2v2-extensions-1.xml
index a137d754..4723149c 100644
--- a/swamid-2.0/www.itslearning.com-integrations-samlmetadata-saml2v2-extensions-1.xml
+++ b/swamid-2.0/www.itslearning.com-integrations-samlmetadata-saml2v2-extensions-1.xml
@@ -123,15 +123,15 @@ BZ3nmbrlzGnKqIX5ScicLNLtdVyxUJXoAA==</ds:X509Certificate>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
     <AssertionConsumerService index="0" isDefault="true" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.itslearning.com/eLogin/AssertionConsumerService.aspx"/>
   </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">itslearning</OrganizationName>
     <OrganizationDisplayName xml:lang="en">itslearning</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://itslearning.com</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xml:lang="en" contactType="technical">
+  </Organization><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xml:lang="en" contactType="technical">
     <EmailAddress>mailto:support@itslearning.com</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xml:lang="en" contactType="support">
+  </ContactPerson><ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xml:lang="en" contactType="support">
     <EmailAddress>mailto:support@itslearning.com</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/www.lararlyftet-validering.se-shibboleth.xml b/swamid-2.0/www.lararlyftet-validering.se-shibboleth.xml
index ada1905f..47d4b2fa 100644
--- a/swamid-2.0/www.lararlyftet-validering.se-shibboleth.xml
+++ b/swamid-2.0/www.lararlyftet-validering.se-shibboleth.xml
@@ -93,9 +93,9 @@ MViWUqDxKicGyuokDNf3hpcc9w==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.lararlyftet-validering.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.lararlyftet-validering.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>Pontus</md:GivenName>
     <md:SurName>Larsson</md:SurName>
     <md:EmailAddress>mailto:pontus.larsson@uhr.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.mit-integration.ladok.se-gui-sp.xml b/swamid-2.0/www.mit-integration.ladok.se-gui-sp.xml
index 58bf7719..b27db322 100644
--- a/swamid-2.0/www.mit-integration.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.mit-integration.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.mit-integration.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.mit-integration.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.mit.ladok.se-gui-sp.xml b/swamid-2.0/www.mit.ladok.se-gui-sp.xml
index 1bb25afc..bf70b0fa 100644
--- a/swamid-2.0/www.mit.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.mit.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.mit.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.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/www.nais.uhr.se-shibboleth.xml b/swamid-2.0/www.nais.uhr.se-shibboleth.xml
index a924dc53..bf70603e 100644
--- a/swamid-2.0/www.nais.uhr.se-shibboleth.xml
+++ b/swamid-2.0/www.nais.uhr.se-shibboleth.xml
@@ -94,9 +94,9 @@ MViWUqDxKicGyuokDNf3hpcc9w==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.nais.uhr.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.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/www.researchprofessional.com-shibboleth.xml b/swamid-2.0/www.researchprofessional.com-shibboleth.xml
index 03b0ba73..b437fdac 100644
--- a/swamid-2.0/www.researchprofessional.com-shibboleth.xml
+++ b/swamid-2.0/www.researchprofessional.com-shibboleth.xml
@@ -63,9 +63,9 @@ tgwZBKIPISvO0cHB2chZHzDJI9PQsgD0OmVfHqQtlwuMw32qK2EcD1NC/VZZ/w==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.researchprofessional.com/Shibboleth.sso/SAML/POST" index="4"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.researchprofessional.com/Shibboleth.sso/SAML/Artifact" index="5"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
+  
+<md:ContactPerson contactType="technical">
     <md:GivenName>David</md:GivenName>
     <md:SurName>Stringer</md:SurName>
     <md:EmailAddress>mailto:david.stringer@researchresearch.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/www.scalable-learning.com.xml b/swamid-2.0/www.scalable-learning.com.xml
index ff8eb4ed..b0df5d86 100644
--- a/swamid-2.0/www.scalable-learning.com.xml
+++ b/swamid-2.0/www.scalable-learning.com.xml
@@ -68,21 +68,21 @@ MPc3VCi4C5rN7EetQsGuorktolOdQFZRbL0loG2Z8/CAbW05/bZOLJ9BBoaw1iZn
       <md:RequestedAttribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true" 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">Scalable Learning</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Scalable Learning</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="en">https://www.scalable-learning.com</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+  </md:Organization><md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
     <Company>ScalableLearning</Company>
     <EmailAddress>mailto:support@scalable-learning.com</EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+  </md:ContactPerson><md:ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
     <Company>ScalableLearning</Company>
     <EmailAddress>mailto:support@scalable-learning.com</EmailAddress>
-  </md:ContactPerson>
-  <md: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">
+  </md:ContactPerson><md: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>Security Response Team</GivenName>
     <EmailAddress>mailto:support@scalable-learning.com</EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md:ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/www.start.ladok.se-gui-sp.xml b/swamid-2.0/www.start.ladok.se-gui-sp.xml
index c5b1888b..33297824 100644
--- a/swamid-2.0/www.start.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.start.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.start.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.start.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.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.sub.su.se.xml b/swamid-2.0/www.sub.su.se.xml
index 5da624b6..34fe9e3b 100644
--- a/swamid-2.0/www.sub.su.se.xml
+++ b/swamid-2.0/www.sub.su.se.xml
@@ -15,15 +15,15 @@
     </KeyDescriptor>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.sub.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>Conny</GivenName>
     <SurName>Richardson</SurName>
     <EmailAddress>mailto:conny.richardson@sub.su.se</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
+  </ContactPerson></md:EntityDescriptor>
diff --git a/swamid-2.0/www.tentaadmindev.uhr.se-shibboleth.xml b/swamid-2.0/www.tentaadmindev.uhr.se-shibboleth.xml
index 849a184e..2d791da0 100644
--- a/swamid-2.0/www.tentaadmindev.uhr.se-shibboleth.xml
+++ b/swamid-2.0/www.tentaadmindev.uhr.se-shibboleth.xml
@@ -87,9 +87,9 @@ OCAgWY6O9B3McR43joEl1kbkE4ckdvrpmDrGdjZn78smL6SGV2Frl5d0ALjQSVkB
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.tentaadmindev.uhr.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.tentaadmindev.uhr.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </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/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/www.utb2.ladok.se-gui-sp.xml b/swamid-2.0/www.utb2.ladok.se-gui-sp.xml
index 5a383ca4..71047729 100644
--- a/swamid-2.0/www.utb2.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.utb2.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.utb2.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.utb2.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.utbildning.ladok.se-gui-sp.xml b/swamid-2.0/www.utbildning.ladok.se-gui-sp.xml
index 1e7f1169..becfd52c 100644
--- a/swamid-2.0/www.utbildning.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.utbildning.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.utbildning.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.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/www.verifiering1.ladok.se-gui-sp.xml b/swamid-2.0/www.verifiering1.ladok.se-gui-sp.xml
index 98e7dd00..e5b71916 100644
--- a/swamid-2.0/www.verifiering1.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.verifiering1.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.verifiering1.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.verifiering1.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.verifiering3.ladok.se-gui-sp.xml b/swamid-2.0/www.verifiering3.ladok.se-gui-sp.xml
index 6d4f4aec..d6bf5e3c 100644
--- a/swamid-2.0/www.verifiering3.ladok.se-gui-sp.xml
+++ b/swamid-2.0/www.verifiering3.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.verifiering3.ladok.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.verifiering3.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/www4.kau.se-isp.xml b/swamid-2.0/www4.kau.se-isp.xml
index 7c240823..6c52b216 100644
--- a/swamid-2.0/www4.kau.se-isp.xml
+++ b/swamid-2.0/www4.kau.se-isp.xml
@@ -34,8 +34,8 @@
     </md:KeyDescriptor>
     <md:AssertionConsumerService index="0" isDefault="false" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www4.kau.se/isp/saml/login_check"/>
   </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/xenosmilus2.umdc.umu.se-8087-sp.xml b/swamid-2.0/xenosmilus2.umdc.umu.se-8087-sp.xml
index dbb7f7b9..c605f864 100644
--- a/swamid-2.0/xenosmilus2.umdc.umu.se-8087-sp.xml
+++ b/swamid-2.0/xenosmilus2.umdc.umu.se-8087-sp.xml
@@ -67,15 +67,15 @@ zkM27NnHTrCe2rBVg0EGz7QTd1JIwLPvgoj4VTi/fSha/tXrYUaqc9AqU1kWI4WN
     <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://xenosmilus2.umdc.umu.se:8087/acs/redirect" index="1"/>
     <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://xenosmilus2.umdc.umu.se:8087/acs/post" 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">ITS</ns0:OrganizationName>
     <ns0:OrganizationDisplayName xml:lang="sv">Umea Universitet - ITS</ns0:OrganizationDisplayName>
     <ns0:OrganizationDisplayName xml:lang="en">Umea Universitet ITS</ns0:OrganizationDisplayName>
     <ns0:OrganizationURL xml:lang="en">http://www.its.umu.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>Roland</ns0:GivenName>
     <ns0:SurName>Hedberg</ns0:SurName>
     <ns0:EmailAddress>mailto:dirg@its.umu.se</ns0:EmailAddress>
-  </ns0:ContactPerson>
-</md:EntityDescriptor>
+  </ns0: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/zeus.slu.se-shibboleth.xml b/swamid-2.0/zeus.slu.se-shibboleth.xml
index 82a7d472..914f8db1 100644
--- a/swamid-2.0/zeus.slu.se-shibboleth.xml
+++ b/swamid-2.0/zeus.slu.se-shibboleth.xml
@@ -83,9 +83,9 @@ pip6tdI9bf7wXvV/3/jBjGaeThWUoaJsO+TdiA==
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://zeus.slu.se/Shibboleth.sso/SAML/POST" index="5"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://zeus.slu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
   </md:SPSSODescriptor>
-  <md:ContactPerson contactType="administrative">
+  
+<md:ContactPerson contactType="administrative">
     <md:GivenName>Mats</md:GivenName>
     <md:SurName>Högström</md:SurName>
     <md:EmailAddress>mailto:mats.hogstrom@slu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+  </md: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-09-11 08:05:44 +0200
committer	Leif Johansson <leifj@sunet.se>	2019-09-11 08:05:44 +0200
commit	3c41b5582b117ff0829608674b68e2a35bd3baca (patch)
tree	27b73b0648578cb3af590d0472f4f3ad809a35ad /swamid-2.0
parent	66f98c1a84d6fccccbd2730c25edc5a05227ce4b (diff)