diff --git a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/CARARE/ordered_sparql_insert_carare_test.sparql b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/CARARE/ordered_sparql_insert_carare_test.sparql
index b8dc1be..094b702 100644
--- a/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/CARARE/ordered_sparql_insert_carare_test.sparql
+++ b/dnet-ariadneplus-graphdb-publisher/src/main/resources/eu/dnetlib/ariadneplus/sparql/enrich/CARARE/ordered_sparql_insert_carare_test.sparql
@@ -1,21 +1,22 @@
 PREFIX aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
+PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
+PREFIX ariadneplus: <https://ariadne-infrastructure.eu/aocat/>
+
 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::carare::test> {
-      ?s	aocat:has_temporal_coverage <https://ariadne-infrastructure.eu/aocat/Time-Span/NOTPROVIDED> .
-      <https://ariadne-infrastructure.eu/aocat/Time-Span/NOTPROVIDED> rdf:type <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/AO_Temporal_Region> .
-      <https://ariadne-infrastructure.eu/aocat/Time-Span/NOTPROVIDED> rdfs:label "Not provided" .
-
+        ?record aocat:was_issued ?created .
     }
 }
+
 WHERE {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::carare::test> {
-        ?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_temporal_coverage ?tc .
-        }
+GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::carare::test> {
+    ?record rdf:type aocat:AO_Collection .
+	?record aocat:was_created_on ?created .
+    MINUS{
+       ?record aocat:was_issued ?issued .
+    }
     }
 };
 
@@ -82,24 +83,6 @@ WHERE {
     }
 };
 
-PREFIX aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
-PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
-PREFIX ariadneplus: <https://ariadne-infrastructure.eu/aocat/>
-
-INSERT {
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::carare::test> {
-        ?record aocat:was_issued ?created .
-    }
-}
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::carare::test> {
-WHERE {
-    ?record rdf:type aocat:AO_Collection .
-	?record aocat:was_created_on ?created .
-    MINUS{
-       ?record aocat:was_issued ?issued .
-    }
-};
-
 
 PREFIX aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
 PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
@@ -145,16 +128,18 @@ PREFIX ariadneplus: <https://ariadne-infrastructure.eu/aocat/>
 
 INSERT {
     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::carare::test> {
-        ?record aocat:was_modified ?XXXX .
+        ?record aocat:was_modified ?collMod .
     }
 }
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::carare::test> {
 WHERE {
+    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::carare::test> {
     ?record rdf:type aocat:AO_Individual_Data_Resource .
-	?record ?XXXXXXXXX
+	?record aocat:is_part_of ?coll .
+	?coll aocat:was_modified ?collMod .
     MINUS{
        ?record aocat:was_modified ?mod .
     }
+    }
 };
 
 PREFIX aocat: <https://www.ariadne-infrastructure.eu/resource/ao/cat/1.1/>
@@ -163,15 +148,17 @@ PREFIX ariadneplus: <https://ariadne-infrastructure.eu/aocat/>
 
 INSERT {
     GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::carare::test> {
-        ?record aocat:was_issued ?XXXX .
+        ?record aocat:was_issued ?collIss .
     }
 }
-    GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::carare::test> {
 WHERE {
+GRAPH <https://ariadne-infrastructure.eu/api_________::ariadne_plus::carare::test> {
     ?record rdf:type aocat:AO_Individual_Data_Resource .
-	?record ?XXXXXXXXX
+	?record aocat:is_part_of ?coll .
+    ?coll aocat:was_issued ?collIss .
     MINUS{
-       ?record aocat:was_issued ?mod .
+       ?record aocat:was_issued ?iss .
+    }
     }
 };