diff --git a/libs/dnet-is-services/src/main/java/eu/dnetlib/dsm/repository/ApiRepository.java b/libs/dnet-is-services/src/main/java/eu/dnetlib/dsm/repository/ApiRepository.java
index 5812228d..3038dd96 100644
--- a/libs/dnet-is-services/src/main/java/eu/dnetlib/dsm/repository/ApiRepository.java
+++ b/libs/dnet-is-services/src/main/java/eu/dnetlib/dsm/repository/ApiRepository.java
@@ -42,7 +42,7 @@ public interface ApiRepository extends JpaRepository<Api, String> {
 
 	@Modifying
 	@Transactional
-	@Query(value = "insert into dsm_apiparams(api, param, value, _dnet_resource_identifier_) values(?1, ?2, ?3, ?1||'@@'||?2)", nativeQuery = true)
+	@Query(value = "insert into dsm_apiparams(api, param, value, _dnet_resource_identifier_) values (?1, ?2, ?3, ?1||'@@'||?2)", nativeQuery = true)
 	void addApiParam(String apiId, String param, String value);
 
 	@Modifying
@@ -52,17 +52,17 @@ public interface ApiRepository extends JpaRepository<Api, String> {
 
 	@Modifying
 	@Transactional
-	@Query("update #{#entityName} set (lastCollectionMdid, lastCollectionDate, lastCollectionTotal) = (?2, ?3, ?4) where id = ?1")
+	@Query("update #{#entityName} set lastCollectionMdid = ?2, lastCollectionDate = ?3, lastCollectionTotal = ?4 where id = ?1")
 	void updateLastCollectionInfo(String apiId, String mdId, Timestamp date, long total);
 
 	@Modifying
 	@Transactional
-	@Query("update #{#entityName} set (lastAggregationMdid, lastAggregationDate, lastAggregationTotal) = (?2, ?3, ?4) where id = ?1")
+	@Query("update #{#entityName} set lastAggregationMdid = ?2, lastAggregationDate = ?3, lastAggregationTotal = ?4 where id = ?1")
 	void updateLastAggregationInfo(String apiId, String mdId, Timestamp date, long total);
 
 	@Modifying
 	@Transactional
-	@Query("update #{#entityName} set (lastDownloadMdid, lastDownloadDate, lastDownloadTotal) = (?2, ?3, ?4) where id = ?1")
+	@Query("update #{#entityName} set lastDownloadMdid = ?2, lastDownloadDate = ?3, lastDownloadTotal = ?4 where id = ?1")
 	void updateLastDownloadInfo(String apiId, String mdId, Timestamp date, long total);
 
 }
diff --git a/libs/dnet-wf-service/src/main/java/eu/dnetlib/manager/wf/nodes/aggregation/DateRangeCollectNode.java b/libs/dnet-wf-service/src/main/java/eu/dnetlib/manager/wf/nodes/aggregation/DateRangeCollectNode.java
index 96225bba..8e26cbe9 100644
--- a/libs/dnet-wf-service/src/main/java/eu/dnetlib/manager/wf/nodes/aggregation/DateRangeCollectNode.java
+++ b/libs/dnet-wf-service/src/main/java/eu/dnetlib/manager/wf/nodes/aggregation/DateRangeCollectNode.java
@@ -12,7 +12,7 @@ import eu.dnetlib.manager.wf.annotations.WfInputParam;
 import eu.dnetlib.manager.wf.annotations.WfNode;
 import eu.dnetlib.manager.wf.nodes.stream.StreamSupplierNode;
 
-@WfNode("collect")
+@WfNode("dateRangeCollect")
 public class DateRangeCollectNode extends StreamSupplierNode<String> {
 
 	@WfInputParam