diff --git a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu.dnetlib.ariadneplus.sparql.enrich.FindSampo/ordered_sparql_insert_FindSampo.sparql b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu.dnetlib.ariadneplus.sparql.enrich.FindSampo/ordered_sparql_insert_FindSampo.sparql
index bc4cca1..6e7443e 100644
--- a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu.dnetlib.ariadneplus.sparql.enrich.FindSampo/ordered_sparql_insert_FindSampo.sparql
+++ b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu.dnetlib.ariadneplus.sparql.enrich.FindSampo/ordered_sparql_insert_FindSampo.sparql
@@ -142,4 +142,36 @@ WHERE {
     }
 };
 
+PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
+INSERT {
+    GRAPH <https://ariadne-infrastructure.eu/ariadneplus::findsampo::periodoplus> {
+      ?temporal aocat:has_period ?period .
+      ?temporal aocat:from ?temporalFrom .
+      ?temporal aocat:until ?temporalUntil .
+    }
+}
+WHERE {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::findsampo::finds> {
+        ?temporal aocat:has_native_period ?period .
+        ?temporal aocat:from ?temporalFrom .
+        ?temporal aocat:until ?temporalUntil .
+    }
+};
+
+PREFIX  aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
+PREFIX  skos: <http://www.w3.org/2004/02/skos/core#>
+INSERT {
+    GRAPH <https://ariadne-infrastructure.eu/ariadneplus::findsampo::periodo> {
+      ?period skos:prefLabel ?label .
+    }
+}
+WHERE {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::findsampo::finds> {
+       ?temporal aocat:has_native_period ?period .
+       ?period skos:prefLabel ?label .
+    }
+};
+
+
+
 
diff --git a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/THANADOS/ordered_sparql_insert_THANADOS.sparql b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/THANADOS/ordered_sparql_insert_THANADOS.sparql
index 747bcf7..56d46d8 100644
--- a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/THANADOS/ordered_sparql_insert_THANADOS.sparql
+++ b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/THANADOS/ordered_sparql_insert_THANADOS.sparql
@@ -1,3 +1,36 @@
+DELETE {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::thanados::api> {
+        <https://ariadne-infrastructure.eu/aocat/Collection/THANADOS/64905CC0-95E1-3F3B-B797-62FE0C434DF3> ?p ?o .
+        ?s ?x <https://ariadne-infrastructure.eu/aocat/Collection/THANADOS/64905CC0-95E1-3F3B-B797-62FE0C434DF3> .
+    }
+}
+WHERE {
+   GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::thanados::api> {
+        <https://ariadne-infrastructure.eu/aocat/Collection/THANADOS/64905CC0-95E1-3F3B-B797-62FE0C434DF3> ?p ?o .
+        ?s ?x <https://ariadne-infrastructure.eu/aocat/Collection/THANADOS/64905CC0-95E1-3F3B-B797-62FE0C434DF3> .
+    }
+};
+
+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 skos: <http://www.w3.org/2004/02/skos/core#>
+INSERT {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::thanados::api> {
+          ?s	aocat:has_type <https://ariadne-infrastructure.eu/aocat/Concept/AO_Type/collection> .
+          <https://ariadne-infrastructure.eu/aocat/Concept/AO_Type/collection> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Concept> .
+          <https://ariadne-infrastructure.eu/aocat/Concept/AO_Type/collection> skos:prefLabel "collection"
+        }
+    }
+    WHERE {
+        GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::thanados::api> {
+            ?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_type ?t .
+            }
+        }
+};
+
 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#>
@@ -20,22 +53,19 @@ WHERE {
 
 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 skos: <http://www.w3.org/2004/02/skos/core#>
 INSERT {
     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::thanados::api> {
-          ?s	aocat:has_type <https://ariadne-infrastructure.eu/aocat/Concept/AO_Type/collection> .
-          <https://ariadne-infrastructure.eu/aocat/Concept/AO_Type/collection> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Concept> .
-          <https://ariadne-infrastructure.eu/aocat/Concept/AO_Type/collection> skos:prefLabel "collection"
+        ?s	aocat:has_title "Title not provided" .
+    }
+}
+WHERE {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::thanados::api> {
+        ?s rdf:type aocat:AO_Individual_Data_Resource .
+        MINUS {
+            ?s rdf:type aocat:AO_Individual_Data_Resource .
+            ?s	aocat:has_title ?title .
         }
     }
-    WHERE {
-        GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::thanados::api> {
-            ?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_type ?t .
-            }
-        }
 };
 
 PREFIX aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
@@ -79,6 +109,8 @@ INSERT {
         }
 };
 
+
+
 PREFIX aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
 PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
 PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
@@ -99,28 +131,6 @@ INSERT {
 };
 
 
-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::thanados::api> {
-      ?s	aocat:has_spatial_coverage <https://ariadne-infrastructure.eu/aocat/Place/NOTPROVIDED> .
-      <https://ariadne-infrastructure.eu/aocat/Place/NOTPROVIDED> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Spatial_Region> .
-      <https://ariadne-infrastructure.eu/aocat/Place/NOTPROVIDED> rdfs:label "Place not provided" .
-      <https://ariadne-infrastructure.eu/aocat/Place/NOTPROVIDED> aocat:has_place_name "Place not provided" .
-    }
-}
-WHERE {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::thanados::api> {
-        ?s rdf:type aocat:AO_Individual_Data_Resource .
-        MINUS {
-            ?s rdf:type aocat:AO_Individual_Data_Resource .
-            ?s	aocat:has_spatial_coverage ?spatialRegion .
-            ?spatialRegion  aocat:has_place_name ?placeName .
-        }
-    }
-};
-
 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#>
@@ -142,6 +152,7 @@ INSERT {
         }
 };
 
+
 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 {
@@ -348,46 +359,15 @@ PREFIX dcterms: <http://purl.org/dc/terms/>
 PREFIX ariadneplus: <https://ariadne-infrastructure.eu/aocat/>
 INSERT {
  GRAPH <https://ariadne-infrastructure.eu/ariadneplus::thanados::periodoplus> {
+     ?temporal aocat:has_period ?periodO_URI .
      ?temporal aocat:from ?temporalFrom .
      ?temporal aocat:until ?temporalUntil .
  }
 }
-USING <https://ariadne-infrastructure.eu/ariadne/periodo>
+USING <https://ariadne-infrastructure.eu/ariadneplus::thanados::periodo>
 USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::thanados::api>
 WHERE {
     ?temporal aocat:has_period ?periodO_URI .
     ?periodO_URI time:intervalStartedBy / time:hasDateTimeDescription / time:year ?temporalFrom .
     ?periodO_URI time:intervalFinishedBy / time:hasDateTimeDescription / time:year ?temporalUntil .
 };
-
-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#>
-PREFIX dcterms: <http://purl.org/dc/terms/>
-PREFIX ariadneplus: <https://ariadne-infrastructure.eu/aocat/>
-INSERT {
- GRAPH <https://ariadne-infrastructure.eu/ariadneplus::thanados::periodoplus> {
-     ?temporal aocat:from ?temporalFrom .
-     ?temporal aocat:until ?temporalUntil .
- }
-}
-USING <https://ariadne-infrastructure.eu/ariadne/periodo>
-USING <https://ariadne-infrastructure.eu/api_________::ariadne_plus::thanados::api>
-WHERE {
-    ?temporal aocat:has_native_period ?np .
-    ?np skos:prefLabel ?y .
-    ?periodO_URI skos:prefLabel ?l .
-    ?periodO_URI time:intervalStartedBy / time:hasDateTimeDescription / time:year ?temporalFrom .
-    ?periodO_URI time:intervalFinishedBy / time:hasDateTimeDescription / time:year ?temporalUntil .
-};
-
-
-
-
-
-
-
-
-
-
-