diff --git a/lib/queries.js b/lib/queries.js
index 9b5622a..bd0d7e2 100644
--- a/lib/queries.js
+++ b/lib/queries.js
@@ -227,12 +227,11 @@ export async function getAllAbbKboOrganizations() {
            ?kboOrg owl:sameAs ?abbOrg .
            ?kboOrg <https://data.lblod.info/vocabularies/generiek/geplandeEindDatum> ?changeTime ;
                     <http://mu.semte.ch/vocabularies/ext/rechtsvorm> ?rechtsVrom ;
-                                           <http://mu.semte.ch/vocabularies/ext/shortName> ?shortName ;
-                                           <http://mu.semte.ch/vocabularies/ext/startDate> ?startDate ;
-                                           <http://www.w3.org/2004/02/skos/core#prefLabel> ?commercialName ;
-                                           <http://www.w3.org/2004/02/skos/core#altLabel> ?legalName ;
-                                           <http://www.w3.org/ns/regorg#orgStatus> ?activeState ;
-                                           <http://schema.org/contactPoint> ?contact .
+                    <http://www.w3.org/2004/02/skos/core#altLabel> ?shortName ;
+                    <http://mu.semte.ch/vocabularies/ext/startDate> ?startDate ;
+                    <http://www.w3.org/ns/regorg#legalName> ?legalName ;
+                    <http://www.w3.org/ns/regorg#orgStatus> ?activeState ;
+                    <http://schema.org/contactPoint> ?contact .
    
            ?contact <http://schema.org/email> ?email ;
                     <http://schema.org/telephone> ?phone ;
@@ -431,6 +430,7 @@ async function updateKboAddress(newKboInfo, identifiers) {
       ?adressUri a <http://www.w3.org/ns/locn#Address> ;
                   <http://www.w3.org/ns/locn#fullAddress> ?fulladdress  .
     }
+  }
     INSERT{
       graph ?g{ 
         ?adressUri a <http://www.w3.org/ns/locn#Address> 
@@ -521,10 +521,9 @@ async function updateKboAdministrativeUnit(newKboInfo, identifiers) {
     GRAPH ?g{
       ?kboUnit a <http://mu.semte.ch/vocabularies/ext/KboEenheid> ;
                 <http://mu.semte.ch/vocabularies/ext/rechtsvorm> ?rechtsVorm ;
-                <http://mu.semte.ch/vocabularies/ext/shortName> ?shortName ;
+                <http://www.w3.org/2004/02/skos/core#altLabel> ?shortName ;
                 <http://mu.semte.ch/vocabularies/ext/startDate> ?startDate ;
-                <http://www.w3.org/2004/02/skos/core#prefLabel> ?orgName ;
-                <http://www.w3.org/2004/02/skos/core#altLabel>  ?commercialName ;
+                <http://www.w3.org/ns/regorg#legalName> ?orgName ;
                 <https://data.lblod.info/vocabularies/generiek/geplandeEindDatum> ?changeTime ;
                 <http://www.w3.org/ns/regorg#orgStatus> ?activeState .
     }                                
@@ -588,10 +587,9 @@ async function updateKboAdministrativeUnit(newKboInfo, identifiers) {
     GRAPH ?g {
       ?kboUnit a <http://mu.semte.ch/vocabularies/ext/KboEenheid> ;
                   <http://mu.semte.ch/vocabularies/ext/rechtsvorm> ?rechtsVorm ;
-                  <http://mu.semte.ch/vocabularies/ext/shortName> ?shortName ;
+                  <http://www.w3.org/2004/02/skos/core#altLabel> ?shortName ;
                   <http://mu.semte.ch/vocabularies/ext/startDate> ?startDate ;
-                  <http://www.w3.org/2004/02/skos/core#prefLabel> ?orgName ;
-                  <http://www.w3.org/2004/02/skos/core#altLabel>  ?commercialName ;
+                  <http://www.w3.org/ns/regorg#legalName> ?orgName ;
                   <https://data.lblod.info/vocabularies/generiek/geplandeEindDatum> ?changeTime ;
                   <http://www.w3.org/ns/regorg#orgStatus> ?activeState .