diff --git a/config/loket-consumer/worship-services-main-info/mapping/queries/dl2op/inheritance/Agent.rq b/config/loket-consumer/worship-services-main-info/mapping/queries/dl2op/inheritance/Agent.rq
index 2c86a86..e875898 100644
--- a/config/loket-consumer/worship-services-main-info/mapping/queries/dl2op/inheritance/Agent.rq
+++ b/config/loket-consumer/worship-services-main-info/mapping/queries/dl2op/inheritance/Agent.rq
@@ -8,12 +8,13 @@ PREFIX person: <http://www.w3.org/ns/person#>
 CONSTRUCT {
   ?s a dc_terms:Agent .
 } WHERE {
+  ?s a ?type .
+
   VALUES ?type {
     lblodlg:Functionaris
     mandaat:Mandataris
+    ere:EredienstMandataris
     ere:RolBedienaar
     person:Person
   }
-
-  ?s a ?type .
 }
diff --git a/config/loket-consumer/worship-services-main-info/mapping/queries/dl2op/inheritance/AgentInPositie.rq b/config/loket-consumer/worship-services-main-info/mapping/queries/dl2op/inheritance/AgentInPositie.rq
index 16b7d2a..dc787ef 100644
--- a/config/loket-consumer/worship-services-main-info/mapping/queries/dl2op/inheritance/AgentInPositie.rq
+++ b/config/loket-consumer/worship-services-main-info/mapping/queries/dl2op/inheritance/AgentInPositie.rq
@@ -6,11 +6,12 @@ PREFIX mandaat: <http://data.vlaanderen.be/ns/mandaat#>
 CONSTRUCT {
   ?s a ch:AgentInPositie .
 } WHERE {
+  ?s a ?type .
+
   VALUES ?type {
     lblodlg:Functionaris
     mandaat:Mandataris
+    ere:EredienstMandataris
     ere:RolBedienaar
   }
-
-  ?s a ?type .
 }
diff --git a/config/loket-consumer/worship-services-main-info/mapping/queries/dl2op/pass/address.sparql b/config/loket-consumer/worship-services-main-info/mapping/queries/dl2op/pass/address.sparql
new file mode 100644
index 0000000..1637ed2
--- /dev/null
+++ b/config/loket-consumer/worship-services-main-info/mapping/queries/dl2op/pass/address.sparql
@@ -0,0 +1,11 @@
+
+CONSTRUCT {
+  ?s ?p ?o.
+} WHERE {
+  ?s a <http://www.w3.org/ns/locn#Address>;
+    ?p ?o.
+
+  FILTER NOT EXISTS {
+    ?s ?p "" .
+  }
+}
diff --git a/config/loket-consumer/worship-services-main-info/mapping/queries/dl2op/pass/bestuursfunctie.sparql b/config/loket-consumer/worship-services-main-info/mapping/queries/dl2op/pass/bestuursfunctie.sparql
new file mode 100644
index 0000000..fd84a65
--- /dev/null
+++ b/config/loket-consumer/worship-services-main-info/mapping/queries/dl2op/pass/bestuursfunctie.sparql
@@ -0,0 +1,7 @@
+CONSTRUCT {
+  ?s <http://schema.org/contactPoint> ?contactpoint.
+}
+WHERE {
+  ?s a <http://data.lblod.info/vocabularies/leidinggevenden/Bestuursfunctie>.
+  ?s <http://schema.org/contactPoint> ?contactpoint.
+}
diff --git a/config/loket-consumer/worship-services-main-info/mapping/queries/dl2op/pass/contactpoint.sparql b/config/loket-consumer/worship-services-main-info/mapping/queries/dl2op/pass/contactpoint.sparql
new file mode 100644
index 0000000..0301a8a
--- /dev/null
+++ b/config/loket-consumer/worship-services-main-info/mapping/queries/dl2op/pass/contactpoint.sparql
@@ -0,0 +1,12 @@
+CONSTRUCT {
+  ?s ?p ?o.
+} WHERE {
+  ?s a <http://schema.org/ContactPoint>;
+    ?p ?o.
+
+ FILTER (?p NOT IN (<http://schema.org/telephone>))
+
+ FILTER NOT EXISTS {
+   ?s ?p "" .
+ }
+}
diff --git a/config/loket-consumer/worship-services-main-info/mapping/queries/dl2op/pass/eredienst-mandataris.sparql b/config/loket-consumer/worship-services-main-info/mapping/queries/dl2op/pass/eredienst-mandataris.sparql
new file mode 100644
index 0000000..7d260bc
--- /dev/null
+++ b/config/loket-consumer/worship-services-main-info/mapping/queries/dl2op/pass/eredienst-mandataris.sparql
@@ -0,0 +1,10 @@
+CONSTRUCT {
+  ?s ?p ?o.
+} WHERE {
+  ?s a <http://data.lblod.info/vocabularies/erediensten/EredienstMandataris>;
+    ?p ?o.
+
+ FILTER NOT EXISTS {
+   ?s ?p "" .
+ }
+}
diff --git a/config/loket-consumer/worship-services-main-info/mapping/queries/dl2op/pass/pass-all-properties-for-predicate.sparql b/config/loket-consumer/worship-services-main-info/mapping/queries/dl2op/pass/pass-all-properties-for-predicate.sparql
deleted file mode 100644
index 6c8f45e..0000000
--- a/config/loket-consumer/worship-services-main-info/mapping/queries/dl2op/pass/pass-all-properties-for-predicate.sparql
+++ /dev/null
@@ -1,66 +0,0 @@
-CONSTRUCT {
-  ?s ?p ?o .
-} WHERE {
-  VALUES ?p {
-    <http://data.lblod.info/vocabularies/contacthub/startdatum>
-    <http://data.lblod.info/vocabularies/contacthub/eindedatum>
-    <http://data.lblod.info/vocabularies/erediensten/geplandeEinddatumAanstelling>
-    <http://data.lblod.info/vocabularies/leidinggevenden/adresRegisterId>
-    <http://data.lblod.info/vocabularies/leidinggevenden/heeftBestuursfunctie>
-    <http://data.vlaanderen.be/ns/besluit#bestuurt>
-    <http://data.vlaanderen.be/ns/besluit#werkingsgebied>
-    <http://data.vlaanderen.be/ns/mandaat#aantalHouders>
-    <http://data.vlaanderen.be/ns/mandaat#beleidsdomein>
-    <http://data.vlaanderen.be/ns/mandaat#bindingEinde>
-    <http://data.vlaanderen.be/ns/mandaat#bindingStart>
-    <http://data.vlaanderen.be/ns/mandaat#einde>
-    <http://data.vlaanderen.be/ns/mandaat#isBestuurlijkeAliasVan>
-    <http://data.vlaanderen.be/ns/mandaat#isTijdelijkVervangenDoor>
-    <http://data.vlaanderen.be/ns/mandaat#rangorde>
-    <http://data.vlaanderen.be/ns/mandaat#start>
-    <http://data.vlaanderen.be/ns/mandaat#status>
-    <https://data.vlaanderen.be/ns/generiek#isTijdspecialisatieVan>
-    <https://data.vlaanderen.be/ns/persoon#gebruikteVoornaam>
-    <http://mu.semte.ch/vocabularies/core/uuid>
-    <http://mu.semte.ch/vocabularies/ext/secondaryContactPoint>
-    <http://mu.semte.ch/vocabularies/ext/werkingsgebiedNiveau>
-    <http://schema.org/contactPoint>
-    <http://schema.org/contactType>
-    <http://schema.org/email>
-    <http://schema.org/faxNumber>
-    <http://schema.org/telephone>
-    <http://schema.org/url>
-    <http://www.w3.org/2000/01/rdf-schema#label>
-    <http://www.w3.org/2004/02/skos/core#altLabel>
-    <http://www.w3.org/2004/02/skos/core#prefLabel>
-    <http://www.w3.org/2004/02/skos/core#scopeNote>
-    <http://www.w3.org/ns/locn#address>
-    <http://www.w3.org/ns/locn#addressArea>
-    <http://www.w3.org/ns/locn#adminUnit1>
-    <http://www.w3.org/ns/locn#adminUnit2>
-    <http://www.w3.org/ns/locn#adminUnitL2>
-    <http://www.w3.org/ns/locn#fullAddress>
-    <http://www.w3.org/ns/locn#postCode>
-    <http://www.w3.org/ns/locn#thoroughfare>
-    <http://www.w3.org/ns/org#classification>
-    <http://www.w3.org/ns/org#hasMembership>
-    <http://www.w3.org/ns/org#hasPost>
-    <http://www.w3.org/ns/org#heldBy>
-    <http://www.w3.org/ns/org#holds>
-    <http://www.w3.org/ns/org#linkedTo>
-    <http://www.w3.org/ns/org#memberOf>
-    <http://www.w3.org/ns/org#organisation>
-    <http://www.w3.org/ns/org#role>
-    <http://xmlns.com/foaf/0.1/familyName>
-    <http://xmlns.com/foaf/0.1/givenName>
-    <https://data.vlaanderen.be/ns/adres#Adresvoorstelling.busnummer>
-    <https://data.vlaanderen.be/ns/adres#Adresvoorstelling.huisnummer>
-    <https://data.vlaanderen.be/ns/adres#gemeentenaam>
-    <https://data.vlaanderen.be/ns/adres#land>
-    <https://data.vlaanderen.be/ns/adres#postcode>
-    <https://data.vlaanderen.be/ns/adres#verwijstNaar>
-    <https://www.w3.org/ns/regorg#legalName>
-  }
-
-  ?s ?p ?o .
-}
diff --git a/config/loket-consumer/worship-services-main-info/mapping/queries/dl2op/pass/pass-all-properties-for-type.sparql b/config/loket-consumer/worship-services-main-info/mapping/queries/dl2op/pass/pass-all-properties-for-type.sparql
deleted file mode 100644
index fe159c3..0000000
--- a/config/loket-consumer/worship-services-main-info/mapping/queries/dl2op/pass/pass-all-properties-for-type.sparql
+++ /dev/null
@@ -1,32 +0,0 @@
-CONSTRUCT {
-  ?s ?p ?o .
-} WHERE {
-  ?s ?p ?o .
-  FILTER EXISTS {
-    ?s a ?type .
-    VALUES ?type {
-      <http://data.lblod.info/vocabularies/contacthub/AgentInPositie>
-      <http://data.lblod.info/vocabularies/erediensten/EredienstMandataris>
-      <http://data.lblod.info/vocabularies/erediensten/RolBedienaar>
-      <http://data.lblod.info/vocabularies/leidinggevenden/Bestuursfunctie>
-      <http://data.lblod.info/vocabularies/leidinggevenden/Functionaris>
-      <http://data.lblod.info/vocabularies/leidinggevenden/FunctionarisStatusCode>
-      <http://data.vlaanderen.be/ns/besluit#Bestuurseenheid>
-      <http://data.vlaanderen.be/ns/besluit#Bestuursorgaan>
-      <http://data.vlaanderen.be/ns/mandaat#Mandaat>
-      <http://data.vlaanderen.be/ns/mandaat#Mandataris>
-      <http://mu.semte.ch/vocabularies/ext/BeleidsdomeinCode>
-      <http://mu.semte.ch/vocabularies/ext/BestuurseenheidClassificatieCode>
-      <http://mu.semte.ch/vocabularies/ext/BestuursfunctieCode>
-      <http://mu.semte.ch/vocabularies/ext/BestuursorgaanClassificatieCode>
-      <http://mu.semte.ch/vocabularies/ext/MandatarisStatusCode>
-      <http://schema.org/ContactPoint>
-      <http://www.w3.org/ns/locn#Address>
-      <http://www.w3.org/ns/org#Membership>
-      <http://www.w3.org/ns/person#Person>
-      <http://purl.org/dc/terms/Agent>
-      <http://data.lblod.info/vocabularies/contacthub/AgentInPositie>
-      <http://www.w3.org/ns/prov#Location>
-    }
-  }
-}
diff --git a/config/loket-consumer/worship-services-main-info/mapping/queries/dl2op/pass/person.sparql b/config/loket-consumer/worship-services-main-info/mapping/queries/dl2op/pass/person.sparql
new file mode 100644
index 0000000..1276ece
--- /dev/null
+++ b/config/loket-consumer/worship-services-main-info/mapping/queries/dl2op/pass/person.sparql
@@ -0,0 +1,16 @@
+CONSTRUCT {
+  ?s ?p ?o.
+} WHERE {
+  ?s a <http://www.w3.org/ns/person#Person>;
+    ?p ?o.
+
+  FILTER (?p IN (
+    <http://www.w3.org/1999/02/22-rdf-syntax-ns#type>,
+    <http://mu.semte.ch/vocabularies/core/uuid>,
+    <http://xmlns.com/foaf/0.1/familyName>
+  ))
+
+  FILTER NOT EXISTS {
+   ?s ?p "" .
+  }
+}
diff --git a/config/loket-consumer/worship-services-main-info/mapping/queries/dl2op/pass/rol-bedienaar.sparql b/config/loket-consumer/worship-services-main-info/mapping/queries/dl2op/pass/rol-bedienaar.sparql
new file mode 100644
index 0000000..7e42662
--- /dev/null
+++ b/config/loket-consumer/worship-services-main-info/mapping/queries/dl2op/pass/rol-bedienaar.sparql
@@ -0,0 +1,10 @@
+CONSTRUCT {
+  ?s ?p ?o.
+} WHERE {
+  ?s a <http://data.lblod.info/vocabularies/erediensten/RolBedienaar>;
+    ?p ?o.
+
+ FILTER NOT EXISTS {
+   ?s ?p "" .
+ }
+}
diff --git a/config/loket-consumer/worship-services-main-info/mapping/queries/dl2op/retract/empty-strings.rq.disabled_until_we_know_if_it_is_needed b/config/loket-consumer/worship-services-main-info/mapping/queries/dl2op/retract/empty-strings.rq.disabled_until_we_know_if_it_is_needed
deleted file mode 100644
index c66ccde..0000000
--- a/config/loket-consumer/worship-services-main-info/mapping/queries/dl2op/retract/empty-strings.rq.disabled_until_we_know_if_it_is_needed
+++ /dev/null
@@ -1,3 +0,0 @@
-CONSTRUCT {} WHERE {
-  ?s ?p "" .
-}
diff --git a/config/loket-consumer/worship-services-private-info/mapping/queries/dl2op/pass/geboorte.sparql b/config/loket-consumer/worship-services-private-info/mapping/queries/dl2op/pass/geboorte.sparql
new file mode 100644
index 0000000..fc48f01
--- /dev/null
+++ b/config/loket-consumer/worship-services-private-info/mapping/queries/dl2op/pass/geboorte.sparql
@@ -0,0 +1,10 @@
+CONSTRUCT {
+  ?s ?p ?o.
+} WHERE {
+  ?s a <http://data.vlaanderen.be/ns/persoon#Geboorte>;
+    ?p ?o.
+
+ FILTER NOT EXISTS {
+   ?s ?p "" .
+ }
+}
diff --git a/config/loket-consumer/worship-services-private-info/mapping/queries/dl2op/pass/pass-all-properties-for-predicate.sparql b/config/loket-consumer/worship-services-private-info/mapping/queries/dl2op/pass/pass-all-properties-for-predicate.sparql
deleted file mode 100644
index 2df0a6f..0000000
--- a/config/loket-consumer/worship-services-private-info/mapping/queries/dl2op/pass/pass-all-properties-for-predicate.sparql
+++ /dev/null
@@ -1,15 +0,0 @@
-PREFIX persoon: <https://data.vlaanderen.be/ns/persoon#>
-
-CONSTRUCT {
-  ?s ?p ?o .
-} WHERE {
-  VALUES ?p {
-    persoon:registratie
-    persoon:heeftNationaliteit
-    persoon:heeftGeboorte
-    persoon:datum
-    persoon:geslacht
-  }
-
-  ?s ?p ?o .
-}
diff --git a/config/loket-consumer/worship-services-private-info/mapping/queries/dl2op/pass/pass-all-properties-for-type.sparql b/config/loket-consumer/worship-services-private-info/mapping/queries/dl2op/pass/pass-all-properties-for-type.sparql
deleted file mode 100644
index a1f95d3..0000000
--- a/config/loket-consumer/worship-services-private-info/mapping/queries/dl2op/pass/pass-all-properties-for-type.sparql
+++ /dev/null
@@ -1,17 +0,0 @@
-PREFIX adms: <http://www.w3.org/ns/adms#>
-PREFIX generiek: <https://data.vlaanderen.be/ns/generiek#>
-PREFIX persoon: <https://data.vlaanderen.be/ns/persoon#>
-
-CONSTRUCT {
-  ?s ?p ?o .
-} WHERE {
-  ?s ?p ?o .
-  FILTER EXISTS {
-    ?s a ?type .
-    VALUES ?type {
-      adms:Identifier
-      generiek:GestructureerdeIdentificator
-      persoon:Geboorte
-    }
-  }
-}