From 23f1feb44a7fc8c3363effc9cb936fc0d1a27ccb Mon Sep 17 00:00:00 2001
From: Alessia Bardi <alessia.bardi@isti.cnr.it>
Date: Fri, 7 Aug 2020 16:41:07 +0200
Subject: [PATCH] updated SPARQL inserts for ADS

---
 .../ADS/ordered_sparql_insert_1957.sparql     | 215 ++++++++++
 .../ADS/ordered_sparql_insert_270.sparql      | 310 ++++++++++-----
 .../ADS/ordered_sparql_insert_273.sparql      | 342 +++++++++-------
 .../ADS/ordered_sparql_insert_836.sparql      | 372 ++++++++++--------
 4 files changed, 834 insertions(+), 405 deletions(-)
 create mode 100644 dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ADS/ordered_sparql_insert_1957.sparql

diff --git a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ADS/ordered_sparql_insert_1957.sparql b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ADS/ordered_sparql_insert_1957.sparql
new file mode 100644
index 0000000..f1e746c
--- /dev/null
+++ b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ADS/ordered_sparql_insert_1957.sparql
@@ -0,0 +1,215 @@
+PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
+PREFIX  rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX  rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+INSERT {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::1957> {
+          ?s	aocat:has_creator <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> .
+          <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Agent> .
+          <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdfs:label "Not provided" .
+          <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> aocat:has_name "Not provided" .
+        }
+    }
+    WHERE {
+        GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::1957> {
+            ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+            MINUS {
+                ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+                ?s	aocat:has_creator ?agent .
+            }
+        }
+};
+PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
+PREFIX  rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX  rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+ INSERT {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::1957> {
+       ?s	aocat:has_owner <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> .
+       <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Agent> .
+       <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdfs:label "Not provided" .
+       <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> aocat:has_name "Not provided" .
+     }
+ }
+ WHERE {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::1957> {
+         ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+         MINUS {
+             ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+             ?s	aocat:has_owner ?agent .
+         }
+     }
+ };
+ PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
+ PREFIX  rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+ PREFIX  rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+ INSERT {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::1957> {
+       ?s	aocat:has_responsible <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> .
+       <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Agent> .
+       <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdfs:label "Not provided" .
+       <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> aocat:has_name "Not provided" .
+     }
+ }
+ WHERE {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::1957> {
+         ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+         MINUS {
+             ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+             ?s	aocat:has_responsible ?agent .
+         }
+     }
+ };
+ 
+
+ 
+ PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
+ INSERT {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::1957> {
+         ?record aocat:was_issued ?issued .
+         ?record aocat:was_modified ?modified .
+         ?record aocat:has_contributor ?contributor .
+         ?record aocat:has_responsible ?legalResponsible .
+         ?record aocat:has_owner ?owner .
+         ?record aocat:has_publisher ?publisher .
+         ?record aocat:has_access_rights ?accessRights .
+         ?record aocat:has_ARIADNE_subject ?archeologicalResourceType .
+     }
+ }
+ USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::1957>
+ WHERE {
+ 	?record aocat:is_part_of ?collection .
+     ?collection aocat:was_issued ?issued .
+     ?collection aocat:was_modified ?modified .
+     ?collection aocat:has_contributor ?contributor .
+     ?collection aocat:has_responsible ?legalResponsible .
+     ?collection aocat:has_owner ?owner .
+     ?collection aocat:has_publisher ?publisher .
+     ?collection aocat:has_access_rights ?accessRights .
+     ?collection aocat:has_ARIADNE_subject ?archeologicalResourceType .
+ };
+
+ PREFIX  skos: <http://www.w3.org/2004/02/skos/core#>
+ PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
+ PREFIX  rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+ INSERT {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::1957> {
+       ?s	aocat:has_native_subject <https://ariadne-infrastructure.eu/aocat/Concept/ADS/NOT_PROVIDED> .
+       <https://ariadne-infrastructure.eu/aocat/Concept/ADS/NOT_PROVIDED> skos:prefLabel "Not provided" .
+     }
+ }
+ WHERE {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::1957> {
+         ?s rdf:type aocat:AO_Individual_Data_Resource .
+         MINUS {
+             ?s rdf:type aocat:AO_Individual_Data_Resource .
+             ?s	aocat:has_native_subject ?ns .
+         }
+     }
+ };
+ PREFIX  skos: <http://www.w3.org/2004/02/skos/core#>
+ PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
+ PREFIX  rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+ INSERT {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::1957> {
+         ?s	aocat:has_language <http://lexvo.org/id/iso639-3/und> .
+         <http://lexvo.org/id/iso639-3/und> skos:prefLabel "und" .
+     }
+ }
+ WHERE {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::1957> {
+         ?s rdf:type aocat:AO_Individual_Data_Resource .
+         MINUS {
+             ?s rdf:type aocat:AO_Individual_Data_Resource .
+             ?s	aocat:has_language ?ns .
+         }
+     }
+ };
+ 
+ PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
+ PREFIX  rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+ INSERT {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::1957> {
+         ?s	aocat:has_creator <https://ariadne-infrastructure.eu/aocat/Agent/ADS/NOT_PROVIDED> .
+         <https://ariadne-infrastructure.eu/aocat/Agent/ADS/NOT_PROVIDED> aocat:has_name "Not provided" .
+     }
+ }
+ WHERE {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::1957> {
+         ?s rdf:type aocat:AO_Individual_Data_Resource .
+         MINUS {
+             ?s rdf:type aocat:AO_Individual_Data_Resource .
+             ?s	aocat:has_creator ?creator .
+         }
+     }
+ };
+ 
+ PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
+ PREFIX  rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+ INSERT {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::1957> {
+         ?s	aocat:has_title "Title not provided" .
+     }
+ }
+ WHERE {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::1957> {
+         ?s rdf:type aocat:AO_Individual_Data_Resource .
+         MINUS {
+             ?s rdf:type aocat:AO_Individual_Data_Resource .
+             ?s	aocat:has_title ?title .
+         }
+     }
+ };
+ 
+
+ PREFIX  skos: <http://www.w3.org/2004/02/skos/core#>
+ PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
+ INSERT {
+     GRAPH <https://ariadne-infrastructure.eu/ariadneplus::ADS::aatplus> {
+         ?record aocat:has_derived_subject ?aat .
+     }
+ }
+ USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::aat>
+ USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::1957>
+ WHERE {
+         {
+             ?record aocat:has_native_subject ?native_subject .
+             ?native_subject skos:exactMatch ?aat	.
+         }
+         union
+         {
+             ?record aocat:has_native_subject ?native_subject .
+             ?native_subject skos:broadMatch ?aat	.
+         }
+         union
+         {
+             ?record aocat:has_native_subject ?native_subject .
+             ?native_subject skos:closeMatch ?aat	.
+         }
+         union
+         {
+             ?record aocat:has_native_subject ?native_subject .
+             ?native_subject skos:narrowMatch ?aat	.
+         }
+ };
+
+ PREFIX  skos: <http://www.w3.org/2004/02/skos/core#> 
+ PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/> 
+ PREFIX time: <http://www.w3.org/2006/time#> 
+ INSERT {
+     GRAPH <https://ariadne-infrastructure.eu/ariadneplus::ADS::periodoplus> {
+         ?temporal aocat:has_period ?periodO .
+         ?temporal aocat:from ?temporalFrom .
+         ?temporal aocat:until ?temporalUntil .
+     }
+ }
+ WHERE {
+ 	?temporal aocat:has_native_period ?native_period .
+     ?native_period skos:prefLabel ?native_label .
+     optional {
+         ?periodO skos:altLabel ?native_label .
+         ?periodO skos:inScheme	<http://n2t.net/ark:/99152/p0kh9ds> .
+         ?periodO time:intervalStartedBy ?intervalStartedBy .
+         ?intervalStartedBy skos:prefLabel ?temporalFrom .
+         ?periodO time:intervalFinishedBy ?intervalFinishedBy .
+         ?intervalFinishedBy skos:prefLabel ?temporalUntil .
+     }
+ };
\ No newline at end of file
diff --git a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ADS/ordered_sparql_insert_270.sparql b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ADS/ordered_sparql_insert_270.sparql
index 68ae219..ead5e5c 100644
--- a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ADS/ordered_sparql_insert_270.sparql
+++ b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ADS/ordered_sparql_insert_270.sparql
@@ -1,101 +1,215 @@
-PREFIX aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
-PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
-PREFIX time: <http://www.w3.org/2006/time#>
-PREFIX ariadneplus: <https://ariadne-infrastructure.eu/aocat/>
-PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-INSERT {
-    GRAPH <https://ariadne-infrastructure.eu/ariadneplus::ads::periodoplus> {
-        ?temporal aocat:has_period ?periodO .
-        ?temporal aocat:from ?temporalFrom .
-        ?temporal aocat:until ?temporalUntil .
-    }
-}
-WHERE {
-	?temporal aocat:has_native_period ?native_period .
-    ?native_period skos:prefLabel ?native_label .
-    optional {
-        ?periodO skos:altLabel ?native_label .
-        ?periodO skos:inScheme	<http://n2t.net/ark:/99152/p0kh9ds> .
-        ?periodO time:intervalStartedBy ?intervalStartedBy .
-        ?intervalStartedBy skos:prefLabel ?temporalFrom .
-        ?periodO time:intervalFinishedBy ?intervalFinishedBy .
-        ?intervalFinishedBy skos:prefLabel ?temporalUntil .
-    }
-}
-;
-INSERT {
-    GRAPH <https://ariadne-infrastructure.eu/ariadneplus::ads::aatplus> {
-        ?record aocat:has_derived_subject ?aat .
-    }
-}
-USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::aat>
-USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::270>
-WHERE {
-        {
-            ?record aocat:has_native_subject ?native_subject .
-            ?native_subject skos:exactMatch ?aat	.
-        }
-        union
-        {
-            ?record aocat:has_native_subject ?native_subject .
-            ?native_subject skos:broadMatch ?aat	.
-        }
-        union
-        {
-            ?record aocat:has_native_subject ?native_subject .
-            ?native_subject skos:closeMatch ?aat	.
-        }
-        union
-        {
-            ?record aocat:has_native_subject ?native_subject .
-            ?native_subject skos:narrowMatch ?aat	.
-        }
-}
-;
-
-PREFIX aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
-PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
-PREFIX time: <http://www.w3.org/2006/time#>
-PREFIX ariadneplus: <https://ariadne-infrastructure.eu/aocat/>
+PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
+PREFIX  rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX  rdfs: <http://www.w3.org/2000/01/rdf-schema#>
 INSERT {
     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::270> {
-        ?record aocat:was_issued ?issued .
-        ?record aocat:was_modified ?modified .
-        ?record aocat:has_contributor ?contributor .
-        ?record aocat:has_responsible ?legalResponsible .
-        ?record aocat:has_owner ?owner .
-        ?record aocat:has_publisher ?publisher .
-        ?record aocat:has_access_rights ?accessRights .
-        ?record aocat:has_ARIADNE_subject ?archeologicalResourceType .
+          ?s	aocat:has_creator <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> .
+          <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Agent> .
+          <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdfs:label "Not provided" .
+          <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> aocat:has_name "Not provided" .
+        }
     }
-}
-USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::270>
-WHERE {
-	?record aocat:is_part_of ?collection .
-    ?collection aocat:was_issued ?issued .
-    ?collection aocat:was_modified ?modified .
-    ?collection aocat:has_contributor ?contributor .
-    ?contributor aocat:has_name ?contributorName .
-    ?collection aocat:has_responsible ?legalResponsible .
-    ?legalResponsible aocat:has_name ?legalResponsibleName .
-    ?collection aocat:has_owner ?owner .
-    ?owner aocat:has_name ?ownerName .
-    ?collection aocat:has_publisher ?publisher .
-    ?publisher aocat:has_name ?publisherName .
-    ?collection aocat:has_access_rights ?accessRights .
-    ?collection  aocat:has_ARIADNE_subject ?archeologicalResourceType .
-    ?archeologicalResourceType skos:prefLabel ?archeologicalResourceTypeName .
-    optional {
-        ?contributor aocat:has_email ?contributorEmail .
-    }
-    optional {
-        ?legalResponsible aocat:has_email ?legalResponsibleEmail .
-    }
-    optional {
-        ?owner aocat:has_email ?ownerEmail .
-    }
-    optional {
-        ?publisher aocat:has_email ?publisherEmail .
-    }
-}
-;
\ No newline at end of file
+    WHERE {
+        GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::270> {
+            ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+            MINUS {
+                ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+                ?s	aocat:has_creator ?agent .
+            }
+        }
+};
+PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
+PREFIX  rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX  rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+ INSERT {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::270> {
+       ?s	aocat:has_owner <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> .
+       <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Agent> .
+       <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdfs:label "Not provided" .
+       <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> aocat:has_name "Not provided" .
+     }
+ }
+ WHERE {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::270> {
+         ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+         MINUS {
+             ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+             ?s	aocat:has_owner ?agent .
+         }
+     }
+ };
+ PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
+ PREFIX  rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+ PREFIX  rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+ INSERT {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::270> {
+       ?s	aocat:has_responsible <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> .
+       <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Agent> .
+       <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdfs:label "Not provided" .
+       <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> aocat:has_name "Not provided" .
+     }
+ }
+ WHERE {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::270> {
+         ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+         MINUS {
+             ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+             ?s	aocat:has_responsible ?agent .
+         }
+     }
+ };
+ 
+
+ 
+ PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
+ INSERT {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::270> {
+         ?record aocat:was_issued ?issued .
+         ?record aocat:was_modified ?modified .
+         ?record aocat:has_contributor ?contributor .
+         ?record aocat:has_responsible ?legalResponsible .
+         ?record aocat:has_owner ?owner .
+         ?record aocat:has_publisher ?publisher .
+         ?record aocat:has_access_rights ?accessRights .
+         ?record aocat:has_ARIADNE_subject ?archeologicalResourceType .
+     }
+ }
+ USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::270>
+ WHERE {
+ 	?record aocat:is_part_of ?collection .
+     ?collection aocat:was_issued ?issued .
+     ?collection aocat:was_modified ?modified .
+     ?collection aocat:has_contributor ?contributor .
+     ?collection aocat:has_responsible ?legalResponsible .
+     ?collection aocat:has_owner ?owner .
+     ?collection aocat:has_publisher ?publisher .
+     ?collection aocat:has_access_rights ?accessRights .
+     ?collection aocat:has_ARIADNE_subject ?archeologicalResourceType .
+ };
+
+ PREFIX  skos: <http://www.w3.org/2004/02/skos/core#>
+ PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
+ PREFIX  rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+ INSERT {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::270> {
+       ?s	aocat:has_native_subject <https://ariadne-infrastructure.eu/aocat/Concept/ADS/NOT_PROVIDED> .
+       <https://ariadne-infrastructure.eu/aocat/Concept/ADS/NOT_PROVIDED> skos:prefLabel "Not provided" .
+     }
+ }
+ WHERE {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::270> {
+         ?s rdf:type aocat:AO_Individual_Data_Resource .
+         MINUS {
+             ?s rdf:type aocat:AO_Individual_Data_Resource .
+             ?s	aocat:has_native_subject ?ns .
+         }
+     }
+ };
+ PREFIX  skos: <http://www.w3.org/2004/02/skos/core#>
+ PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
+ PREFIX  rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+ INSERT {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::270> {
+         ?s	aocat:has_language <http://lexvo.org/id/iso639-3/und> .
+         <http://lexvo.org/id/iso639-3/und> skos:prefLabel "und" .
+     }
+ }
+ WHERE {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::270> {
+         ?s rdf:type aocat:AO_Individual_Data_Resource .
+         MINUS {
+             ?s rdf:type aocat:AO_Individual_Data_Resource .
+             ?s	aocat:has_language ?ns .
+         }
+     }
+ };
+ 
+ PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
+ PREFIX  rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+ INSERT {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::270> {
+         ?s	aocat:has_creator <https://ariadne-infrastructure.eu/aocat/Agent/ADS/NOT_PROVIDED> .
+         <https://ariadne-infrastructure.eu/aocat/Agent/ADS/NOT_PROVIDED> aocat:has_name "Not provided" .
+     }
+ }
+ WHERE {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::270> {
+         ?s rdf:type aocat:AO_Individual_Data_Resource .
+         MINUS {
+             ?s rdf:type aocat:AO_Individual_Data_Resource .
+             ?s	aocat:has_creator ?creator .
+         }
+     }
+ };
+ 
+ PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
+ PREFIX  rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+ INSERT {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::270> {
+         ?s	aocat:has_title "Title not provided" .
+     }
+ }
+ WHERE {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::270> {
+         ?s rdf:type aocat:AO_Individual_Data_Resource .
+         MINUS {
+             ?s rdf:type aocat:AO_Individual_Data_Resource .
+             ?s	aocat:has_title ?title .
+         }
+     }
+ };
+ 
+
+ PREFIX  skos: <http://www.w3.org/2004/02/skos/core#>
+ PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
+ INSERT {
+     GRAPH <https://ariadne-infrastructure.eu/ariadneplus::ADS::aatplus> {
+         ?record aocat:has_derived_subject ?aat .
+     }
+ }
+ USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::aat>
+ USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::270>
+ WHERE {
+         {
+             ?record aocat:has_native_subject ?native_subject .
+             ?native_subject skos:exactMatch ?aat	.
+         }
+         union
+         {
+             ?record aocat:has_native_subject ?native_subject .
+             ?native_subject skos:broadMatch ?aat	.
+         }
+         union
+         {
+             ?record aocat:has_native_subject ?native_subject .
+             ?native_subject skos:closeMatch ?aat	.
+         }
+         union
+         {
+             ?record aocat:has_native_subject ?native_subject .
+             ?native_subject skos:narrowMatch ?aat	.
+         }
+ };
+
+ PREFIX  skos: <http://www.w3.org/2004/02/skos/core#> 
+ PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/> 
+ PREFIX time: <http://www.w3.org/2006/time#> 
+ INSERT {
+     GRAPH <https://ariadne-infrastructure.eu/ariadneplus::ADS::periodoplus> {
+         ?temporal aocat:has_period ?periodO .
+         ?temporal aocat:from ?temporalFrom .
+         ?temporal aocat:until ?temporalUntil .
+     }
+ }
+ WHERE {
+ 	?temporal aocat:has_native_period ?native_period .
+     ?native_period skos:prefLabel ?native_label .
+     optional {
+         ?periodO skos:altLabel ?native_label .
+         ?periodO skos:inScheme	<http://n2t.net/ark:/99152/p0kh9ds> .
+         ?periodO time:intervalStartedBy ?intervalStartedBy .
+         ?intervalStartedBy skos:prefLabel ?temporalFrom .
+         ?periodO time:intervalFinishedBy ?intervalFinishedBy .
+         ?intervalFinishedBy skos:prefLabel ?temporalUntil .
+     }
+ };
\ No newline at end of file
diff --git a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ADS/ordered_sparql_insert_273.sparql b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ADS/ordered_sparql_insert_273.sparql
index 1b6fa59..eca2a4c 100644
--- a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ADS/ordered_sparql_insert_273.sparql
+++ b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ADS/ordered_sparql_insert_273.sparql
@@ -1,147 +1,215 @@
-PREFIX  skos: <http://www.w3.org/2004/02/skos/core#>
 PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
 PREFIX  rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
 PREFIX  rdfs: <http://www.w3.org/2000/01/rdf-schema#>
-PREFIX time: <http://www.w3.org/2006/time#>
-PREFIX ariadneplus: <https://ariadne-infrastructure.eu/aocat/>
-
-# INHERIT FROM COLLECTION
 INSERT {
     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::273> {
-        ?record aocat:was_issued ?issued .
-        ?record aocat:was_modified ?modified .
-        ?record aocat:has_contributor ?contributor .
-        ?record aocat:has_responsible ?legalResponsible .
-        ?record aocat:has_owner ?owner .
-        ?record aocat:has_publisher ?publisher .
-        ?record aocat:has_access_rights ?accessRights .
-        ?record aocat:has_ARIADNE_subject ?archeologicalResourceType .
-    }
-}
-USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::273>
-WHERE {
-	?record aocat:is_part_of ?collection .
-    ?collection aocat:was_issued ?issued .
-    ?collection aocat:was_modified ?modified .
-    ?collection aocat:has_contributor ?contributor .
-    ?collection aocat:has_responsible ?legalResponsible .
-    ?collection aocat:has_owner ?owner .
-    ?collection aocat:has_publisher ?publisher .
-    ?collection aocat:has_access_rights ?accessRights .
-    ?collection aocat:has_ARIADNE_subject ?archeologicalResourceType .
-}
-
-# INSERT DEFAULTS FOR RECORDS
-
-INSERT {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::273> {
-      ?s	aocat:has_native_subject <https://ariadne-infrastructure.eu/aocat/Concept/ADS/NOT_PROVIDED> .
-      <https://ariadne-infrastructure.eu/aocat/Concept/ADS/NOT_PROVIDED> skos:prefLabel "Not provided" .
-    }
-}
-WHERE {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::273> {
-        ?s rdf:type aocat:AO_Individual_Data_Resource .
-        MINUS {
-            ?s rdf:type aocat:AO_Individual_Data_Resource .
-            ?s	aocat:has_native_subject ?ns .
+          ?s	aocat:has_creator <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> .
+          <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Agent> .
+          <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdfs:label "Not provided" .
+          <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> aocat:has_name "Not provided" .
         }
     }
-};
-INSERT {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::273> {
-        ?s	aocat:has_language <http://lexvo.org/id/iso639-3/und> .
-        <http://lexvo.org/id/iso639-3/und> skos:prefLabel "und" .
-    }
-}
-WHERE {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::273> {
-        ?s rdf:type aocat:AO_Individual_Data_Resource .
-        MINUS {
-            ?s rdf:type aocat:AO_Individual_Data_Resource .
-            ?s	aocat:has_language ?ns .
-        }
-    }
-};
-INSERT {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::273> {
-        ?s	aocat:has_creator <https://ariadne-infrastructure.eu/aocat/Agent/ADS/NOT_PROVIDED> .
-        <https://ariadne-infrastructure.eu/aocat/Agent/ADS/NOT_PROVIDED> aocat:has_name "Not provided" .
-    }
-}
-WHERE {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::273> {
-        ?s rdf:type aocat:AO_Individual_Data_Resource .
-        MINUS {
-            ?s rdf:type aocat:AO_Individual_Data_Resource .
-            ?s	aocat:has_creator ?creator .
-        }
-    }
-};
-
-INSERT {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::273> {
-        ?s	aocat:has_title "Title not provided" .
-    }
-}
-WHERE {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::273> {
-        ?s rdf:type aocat:AO_Individual_Data_Resource .
-        MINUS {
-            ?s rdf:type aocat:AO_Individual_Data_Resource .
-            ?s	aocat:has_title ?title .
-        }
-    }
-};
-
-
-#AAT ENRICHMENT
-INSERT {
-    GRAPH <https://ariadne-infrastructure.eu/ariadneplus::ADS::aatplus> {
-        ?record aocat:has_derived_subject ?aat .
-    }
-}
-USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::aat>
-USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::273>
-WHERE {
-        {
-            ?record aocat:has_native_subject ?native_subject .
-            ?native_subject skos:exactMatch ?aat	.
-        }
-        union
-        {
-            ?record aocat:has_native_subject ?native_subject .
-            ?native_subject skos:broadMatch ?aat	.
-        }
-        union
-        {
-            ?record aocat:has_native_subject ?native_subject .
-            ?native_subject skos:closeMatch ?aat	.
-        }
-        union
-        {
-            ?record aocat:has_native_subject ?native_subject .
-            ?native_subject skos:narrowMatch ?aat	.
+    WHERE {
+        GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::273> {
+            ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+            MINUS {
+                ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+                ?s	aocat:has_creator ?agent .
+            }
         }
 };
+PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
+PREFIX  rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX  rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+ INSERT {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::273> {
+       ?s	aocat:has_owner <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> .
+       <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Agent> .
+       <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdfs:label "Not provided" .
+       <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> aocat:has_name "Not provided" .
+     }
+ }
+ WHERE {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::273> {
+         ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+         MINUS {
+             ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+             ?s	aocat:has_owner ?agent .
+         }
+     }
+ };
+ PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
+ PREFIX  rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+ PREFIX  rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+ INSERT {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::273> {
+       ?s	aocat:has_responsible <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> .
+       <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Agent> .
+       <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdfs:label "Not provided" .
+       <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> aocat:has_name "Not provided" .
+     }
+ }
+ WHERE {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::273> {
+         ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+         MINUS {
+             ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+             ?s	aocat:has_responsible ?agent .
+         }
+     }
+ };
+ 
 
-#PERIODO ENRICHMENT
-INSERT {
-    GRAPH <https://ariadne-infrastructure.eu/ariadneplus::ADS::periodoplus> {
-        ?temporal aocat:has_period ?periodO .
-        ?temporal aocat:from ?temporalFrom .
-        ?temporal aocat:until ?temporalUntil .
-    }
-}
-WHERE {
-	?temporal aocat:has_native_period ?native_period .
-    ?native_period skos:prefLabel ?native_label .
-    optional {
-        ?periodO skos:altLabel ?native_label .
-        ?periodO skos:inScheme	<http://n2t.net/ark:/99152/p0kh9ds> .
-        ?periodO time:intervalStartedBy ?intervalStartedBy .
-        ?intervalStartedBy skos:prefLabel ?temporalFrom .
-        ?periodO time:intervalFinishedBy ?intervalFinishedBy .
-        ?intervalFinishedBy skos:prefLabel ?temporalUntil .
-    }
-};
\ No newline at end of file
+ 
+ PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
+ INSERT {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::273> {
+         ?record aocat:was_issued ?issued .
+         ?record aocat:was_modified ?modified .
+         ?record aocat:has_contributor ?contributor .
+         ?record aocat:has_responsible ?legalResponsible .
+         ?record aocat:has_owner ?owner .
+         ?record aocat:has_publisher ?publisher .
+         ?record aocat:has_access_rights ?accessRights .
+         ?record aocat:has_ARIADNE_subject ?archeologicalResourceType .
+     }
+ }
+ USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::273>
+ WHERE {
+ 	?record aocat:is_part_of ?collection .
+     ?collection aocat:was_issued ?issued .
+     ?collection aocat:was_modified ?modified .
+     ?collection aocat:has_contributor ?contributor .
+     ?collection aocat:has_responsible ?legalResponsible .
+     ?collection aocat:has_owner ?owner .
+     ?collection aocat:has_publisher ?publisher .
+     ?collection aocat:has_access_rights ?accessRights .
+     ?collection aocat:has_ARIADNE_subject ?archeologicalResourceType .
+ };
+
+ PREFIX  skos: <http://www.w3.org/2004/02/skos/core#>
+ PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
+ PREFIX  rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+ INSERT {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::273> {
+       ?s	aocat:has_native_subject <https://ariadne-infrastructure.eu/aocat/Concept/ADS/NOT_PROVIDED> .
+       <https://ariadne-infrastructure.eu/aocat/Concept/ADS/NOT_PROVIDED> skos:prefLabel "Not provided" .
+     }
+ }
+ WHERE {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::273> {
+         ?s rdf:type aocat:AO_Individual_Data_Resource .
+         MINUS {
+             ?s rdf:type aocat:AO_Individual_Data_Resource .
+             ?s	aocat:has_native_subject ?ns .
+         }
+     }
+ };
+ PREFIX  skos: <http://www.w3.org/2004/02/skos/core#>
+ PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
+ PREFIX  rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+ INSERT {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::273> {
+         ?s	aocat:has_language <http://lexvo.org/id/iso639-3/und> .
+         <http://lexvo.org/id/iso639-3/und> skos:prefLabel "und" .
+     }
+ }
+ WHERE {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::273> {
+         ?s rdf:type aocat:AO_Individual_Data_Resource .
+         MINUS {
+             ?s rdf:type aocat:AO_Individual_Data_Resource .
+             ?s	aocat:has_language ?ns .
+         }
+     }
+ };
+ 
+ PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
+ PREFIX  rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+ INSERT {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::273> {
+         ?s	aocat:has_creator <https://ariadne-infrastructure.eu/aocat/Agent/ADS/NOT_PROVIDED> .
+         <https://ariadne-infrastructure.eu/aocat/Agent/ADS/NOT_PROVIDED> aocat:has_name "Not provided" .
+     }
+ }
+ WHERE {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::273> {
+         ?s rdf:type aocat:AO_Individual_Data_Resource .
+         MINUS {
+             ?s rdf:type aocat:AO_Individual_Data_Resource .
+             ?s	aocat:has_creator ?creator .
+         }
+     }
+ };
+ 
+ PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
+ PREFIX  rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+ INSERT {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::273> {
+         ?s	aocat:has_title "Title not provided" .
+     }
+ }
+ WHERE {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::273> {
+         ?s rdf:type aocat:AO_Individual_Data_Resource .
+         MINUS {
+             ?s rdf:type aocat:AO_Individual_Data_Resource .
+             ?s	aocat:has_title ?title .
+         }
+     }
+ };
+ 
+
+ PREFIX  skos: <http://www.w3.org/2004/02/skos/core#>
+ PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
+ INSERT {
+     GRAPH <https://ariadne-infrastructure.eu/ariadneplus::ADS::aatplus> {
+         ?record aocat:has_derived_subject ?aat .
+     }
+ }
+ USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::aat>
+ USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::273>
+ WHERE {
+         {
+             ?record aocat:has_native_subject ?native_subject .
+             ?native_subject skos:exactMatch ?aat	.
+         }
+         union
+         {
+             ?record aocat:has_native_subject ?native_subject .
+             ?native_subject skos:broadMatch ?aat	.
+         }
+         union
+         {
+             ?record aocat:has_native_subject ?native_subject .
+             ?native_subject skos:closeMatch ?aat	.
+         }
+         union
+         {
+             ?record aocat:has_native_subject ?native_subject .
+             ?native_subject skos:narrowMatch ?aat	.
+         }
+ };
+
+ PREFIX  skos: <http://www.w3.org/2004/02/skos/core#> 
+ PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/> 
+ PREFIX time: <http://www.w3.org/2006/time#> 
+ INSERT {
+     GRAPH <https://ariadne-infrastructure.eu/ariadneplus::ADS::periodoplus> {
+         ?temporal aocat:has_period ?periodO .
+         ?temporal aocat:from ?temporalFrom .
+         ?temporal aocat:until ?temporalUntil .
+     }
+ }
+ WHERE {
+ 	?temporal aocat:has_native_period ?native_period .
+     ?native_period skos:prefLabel ?native_label .
+     optional {
+         ?periodO skos:altLabel ?native_label .
+         ?periodO skos:inScheme	<http://n2t.net/ark:/99152/p0kh9ds> .
+         ?periodO time:intervalStartedBy ?intervalStartedBy .
+         ?intervalStartedBy skos:prefLabel ?temporalFrom .
+         ?periodO time:intervalFinishedBy ?intervalFinishedBy .
+         ?intervalFinishedBy skos:prefLabel ?temporalUntil .
+     }
+ };
\ No newline at end of file
diff --git a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ADS/ordered_sparql_insert_836.sparql b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ADS/ordered_sparql_insert_836.sparql
index 3c456bb..b921d42 100644
--- a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ADS/ordered_sparql_insert_836.sparql
+++ b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/ADS/ordered_sparql_insert_836.sparql
@@ -1,183 +1,215 @@
-PREFIX  skos: <http://www.w3.org/2004/02/skos/core#>
 PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
 PREFIX  rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
 PREFIX  rdfs: <http://www.w3.org/2000/01/rdf-schema#>
-PREFIX time: <http://www.w3.org/2006/time#>
-PREFIX ariadneplus: <https://ariadne-infrastructure.eu/aocat/>
-
-#INSERT DEFAULTS FOR COLLECTION
 INSERT {
     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::836> {
-      ?s	aocat:has_owner <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> .
-      <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Agent> .
-      <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdfs:label "Not provided" .
-      <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> aocat:has_name "Not provided" .
+          ?s	aocat:has_creator <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> .
+          <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Agent> .
+          <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdfs:label "Not provided" .
+          <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> aocat:has_name "Not provided" .
+        }
     }
-}
-WHERE {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::836> {
-        ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
-        MINUS {
+    WHERE {
+        GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::836> {
             ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
-            ?s	aocat:has_owner ?agent .
+            MINUS {
+                ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+                ?s	aocat:has_creator ?agent .
+            }
         }
-    }
-};
-INSERT {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::836> {
-      ?s	aocat:has_responsible <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> .
-      <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Agent> .
-      <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdfs:label "Not provided" .
-      <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> aocat:has_name "Not provided" .
-    }
-}
-WHERE {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::836> {
-        ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
-        MINUS {
-            ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
-            ?s	aocat:has_responsible ?agent .
-        }
-    }
 };
+PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
+PREFIX  rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX  rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+ INSERT {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::836> {
+       ?s	aocat:has_owner <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> .
+       <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Agent> .
+       <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdfs:label "Not provided" .
+       <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> aocat:has_name "Not provided" .
+     }
+ }
+ WHERE {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::836> {
+         ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+         MINUS {
+             ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+             ?s	aocat:has_owner ?agent .
+         }
+     }
+ };
+ PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
+ PREFIX  rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+ PREFIX  rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+ INSERT {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::836> {
+       ?s	aocat:has_responsible <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> .
+       <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Agent> .
+       <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> rdfs:label "Not provided" .
+       <https://ariadne-infrastructure.eu/aocat/Agent/NOTPROVIDED> aocat:has_name "Not provided" .
+     }
+ }
+ WHERE {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::836> {
+         ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+         MINUS {
+             ?s rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Collection> .
+             ?s	aocat:has_responsible ?agent .
+         }
+     }
+ };
+ 
 
-# INHERIT FROM COLLECTION
-INSERT {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::836> {
-        ?record aocat:was_issued ?issued .
-        ?record aocat:was_modified ?modified .
-        ?record aocat:has_contributor ?contributor .
-        ?record aocat:has_responsible ?legalResponsible .
-        ?record aocat:has_owner ?owner .
-        ?record aocat:has_publisher ?publisher .
-        ?record aocat:has_access_rights ?accessRights .
-        ?record aocat:has_ARIADNE_subject ?archeologicalResourceType .
-    }
-}
-USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::836>
-WHERE {
-	?record aocat:is_part_of ?collection .
-    ?collection aocat:was_issued ?issued .
-    ?collection aocat:was_modified ?modified .
-    ?collection aocat:has_contributor ?contributor .
-    ?collection aocat:has_responsible ?legalResponsible .
-    ?collection aocat:has_owner ?owner .
-    ?collection aocat:has_publisher ?publisher .
-    ?collection aocat:has_access_rights ?accessRights .
-    ?collection aocat:has_ARIADNE_subject ?archeologicalResourceType .
-};
+ 
+ PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
+ INSERT {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::836> {
+         ?record aocat:was_issued ?issued .
+         ?record aocat:was_modified ?modified .
+         ?record aocat:has_contributor ?contributor .
+         ?record aocat:has_responsible ?legalResponsible .
+         ?record aocat:has_owner ?owner .
+         ?record aocat:has_publisher ?publisher .
+         ?record aocat:has_access_rights ?accessRights .
+         ?record aocat:has_ARIADNE_subject ?archeologicalResourceType .
+     }
+ }
+ USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::836>
+ WHERE {
+ 	?record aocat:is_part_of ?collection .
+     ?collection aocat:was_issued ?issued .
+     ?collection aocat:was_modified ?modified .
+     ?collection aocat:has_contributor ?contributor .
+     ?collection aocat:has_responsible ?legalResponsible .
+     ?collection aocat:has_owner ?owner .
+     ?collection aocat:has_publisher ?publisher .
+     ?collection aocat:has_access_rights ?accessRights .
+     ?collection aocat:has_ARIADNE_subject ?archeologicalResourceType .
+ };
 
-# INSERT DEFAULTS FOR RECORDS
+ PREFIX  skos: <http://www.w3.org/2004/02/skos/core#>
+ PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
+ PREFIX  rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+ INSERT {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::836> {
+       ?s	aocat:has_native_subject <https://ariadne-infrastructure.eu/aocat/Concept/ADS/NOT_PROVIDED> .
+       <https://ariadne-infrastructure.eu/aocat/Concept/ADS/NOT_PROVIDED> skos:prefLabel "Not provided" .
+     }
+ }
+ WHERE {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::836> {
+         ?s rdf:type aocat:AO_Individual_Data_Resource .
+         MINUS {
+             ?s rdf:type aocat:AO_Individual_Data_Resource .
+             ?s	aocat:has_native_subject ?ns .
+         }
+     }
+ };
+ PREFIX  skos: <http://www.w3.org/2004/02/skos/core#>
+ PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
+ PREFIX  rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+ INSERT {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::836> {
+         ?s	aocat:has_language <http://lexvo.org/id/iso639-3/und> .
+         <http://lexvo.org/id/iso639-3/und> skos:prefLabel "und" .
+     }
+ }
+ WHERE {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::836> {
+         ?s rdf:type aocat:AO_Individual_Data_Resource .
+         MINUS {
+             ?s rdf:type aocat:AO_Individual_Data_Resource .
+             ?s	aocat:has_language ?ns .
+         }
+     }
+ };
+ 
+ PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
+ PREFIX  rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+ INSERT {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::836> {
+         ?s	aocat:has_creator <https://ariadne-infrastructure.eu/aocat/Agent/ADS/NOT_PROVIDED> .
+         <https://ariadne-infrastructure.eu/aocat/Agent/ADS/NOT_PROVIDED> aocat:has_name "Not provided" .
+     }
+ }
+ WHERE {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::836> {
+         ?s rdf:type aocat:AO_Individual_Data_Resource .
+         MINUS {
+             ?s rdf:type aocat:AO_Individual_Data_Resource .
+             ?s	aocat:has_creator ?creator .
+         }
+     }
+ };
+ 
+ PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
+ PREFIX  rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+ INSERT {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::836> {
+         ?s	aocat:has_title "Title not provided" .
+     }
+ }
+ WHERE {
+     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::836> {
+         ?s rdf:type aocat:AO_Individual_Data_Resource .
+         MINUS {
+             ?s rdf:type aocat:AO_Individual_Data_Resource .
+             ?s	aocat:has_title ?title .
+         }
+     }
+ };
+ 
 
-INSERT {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::836> {
-      ?s	aocat:has_native_subject <https://ariadne-infrastructure.eu/aocat/Concept/ADS/NOT_PROVIDED> .
-      <https://ariadne-infrastructure.eu/aocat/Concept/ADS/NOT_PROVIDED> skos:prefLabel "Not provided" .
-    }
-}
-WHERE {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::836> {
-        ?s rdf:type aocat:AO_Individual_Data_Resource .
-        MINUS {
-            ?s rdf:type aocat:AO_Individual_Data_Resource .
-            ?s	aocat:has_native_subject ?ns .
-        }
-    }
-};
-INSERT {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::836> {
-        ?s	aocat:has_language <http://lexvo.org/id/iso639-3/und> .
-        <http://lexvo.org/id/iso639-3/und> skos:prefLabel "und" .
-    }
-}
-WHERE {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::836> {
-        ?s rdf:type aocat:AO_Individual_Data_Resource .
-        MINUS {
-            ?s rdf:type aocat:AO_Individual_Data_Resource .
-            ?s	aocat:has_language ?ns .
-        }
-    }
-};
-INSERT {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::836> {
-        ?s	aocat:has_creator <https://ariadne-infrastructure.eu/aocat/Agent/ADS/NOT_PROVIDED> .
-        <https://ariadne-infrastructure.eu/aocat/Agent/ADS/NOT_PROVIDED> aocat:has_name "Not provided" .
-    }
-}
-WHERE {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::836> {
-        ?s rdf:type aocat:AO_Individual_Data_Resource .
-        MINUS {
-            ?s rdf:type aocat:AO_Individual_Data_Resource .
-            ?s	aocat:has_creator ?creator .
-        }
-    }
-};
+ PREFIX  skos: <http://www.w3.org/2004/02/skos/core#>
+ PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
+ INSERT {
+     GRAPH <https://ariadne-infrastructure.eu/ariadneplus::ADS::aatplus> {
+         ?record aocat:has_derived_subject ?aat .
+     }
+ }
+ USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::aat>
+ USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::836>
+ WHERE {
+         {
+             ?record aocat:has_native_subject ?native_subject .
+             ?native_subject skos:exactMatch ?aat	.
+         }
+         union
+         {
+             ?record aocat:has_native_subject ?native_subject .
+             ?native_subject skos:broadMatch ?aat	.
+         }
+         union
+         {
+             ?record aocat:has_native_subject ?native_subject .
+             ?native_subject skos:closeMatch ?aat	.
+         }
+         union
+         {
+             ?record aocat:has_native_subject ?native_subject .
+             ?native_subject skos:narrowMatch ?aat	.
+         }
+ };
 
-INSERT {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::836> {
-        ?s	aocat:has_title "Title not provided" .
-    }
-}
-WHERE {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::836> {
-        ?s rdf:type aocat:AO_Individual_Data_Resource .
-        MINUS {
-            ?s rdf:type aocat:AO_Individual_Data_Resource .
-            ?s	aocat:has_title ?title .
-        }
-    }
-};
-
-
-#AAT ENRICHMENT
-INSERT {
-    GRAPH <https://ariadne-infrastructure.eu/ariadneplus::ADS::aatplus> {
-        ?record aocat:has_derived_subject ?aat .
-    }
-}
-USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::aat>
-USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::ads::836>
-WHERE {
-        {
-            ?record aocat:has_native_subject ?native_subject .
-            ?native_subject skos:exactMatch ?aat	.
-        }
-        union
-        {
-            ?record aocat:has_native_subject ?native_subject .
-            ?native_subject skos:broadMatch ?aat	.
-        }
-        union
-        {
-            ?record aocat:has_native_subject ?native_subject .
-            ?native_subject skos:closeMatch ?aat	.
-        }
-        union
-        {
-            ?record aocat:has_native_subject ?native_subject .
-            ?native_subject skos:narrowMatch ?aat	.
-        }
-};
-
-#PERIODO ENRICHMENT
-INSERT {
-    GRAPH <https://ariadne-infrastructure.eu/ariadneplus::ADS::periodoplus> {
-        ?temporal aocat:has_period ?periodO .
-        ?temporal aocat:from ?temporalFrom .
-        ?temporal aocat:until ?temporalUntil .
-    }
-}
-WHERE {
-	?temporal aocat:has_native_period ?native_period .
-    ?native_period skos:prefLabel ?native_label .
-    optional {
-        ?periodO skos:altLabel ?native_label .
-        ?periodO skos:inScheme	<http://n2t.net/ark:/99152/p0kh9ds> .
-        ?periodO time:intervalStartedBy ?intervalStartedBy .
-        ?intervalStartedBy skos:prefLabel ?temporalFrom .
-        ?periodO time:intervalFinishedBy ?intervalFinishedBy .
-        ?intervalFinishedBy skos:prefLabel ?temporalUntil .
-    }
-};
\ No newline at end of file
+ PREFIX  skos: <http://www.w3.org/2004/02/skos/core#> 
+ PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/> 
+ PREFIX time: <http://www.w3.org/2006/time#> 
+ INSERT {
+     GRAPH <https://ariadne-infrastructure.eu/ariadneplus::ADS::periodoplus> {
+         ?temporal aocat:has_period ?periodO .
+         ?temporal aocat:from ?temporalFrom .
+         ?temporal aocat:until ?temporalUntil .
+     }
+ }
+ WHERE {
+ 	?temporal aocat:has_native_period ?native_period .
+     ?native_period skos:prefLabel ?native_label .
+     optional {
+         ?periodO skos:altLabel ?native_label .
+         ?periodO skos:inScheme	<http://n2t.net/ark:/99152/p0kh9ds> .
+         ?periodO time:intervalStartedBy ?intervalStartedBy .
+         ?intervalStartedBy skos:prefLabel ?temporalFrom .
+         ?periodO time:intervalFinishedBy ?intervalFinishedBy .
+         ?intervalFinishedBy skos:prefLabel ?temporalUntil .
+     }
+ };
\ No newline at end of file