diff --git a/dhp-workflows/dhp-enrichment/src/main/java/eu/dnetlib/dhp/bulktag/eosc/SparkEoscTag.java b/dhp-workflows/dhp-enrichment/src/main/java/eu/dnetlib/dhp/bulktag/eosc/SparkEoscTag.java
index d249af5a7..4a6ef0ab0 100644
--- a/dhp-workflows/dhp-enrichment/src/main/java/eu/dnetlib/dhp/bulktag/eosc/SparkEoscTag.java
+++ b/dhp-workflows/dhp-enrichment/src/main/java/eu/dnetlib/dhp/bulktag/eosc/SparkEoscTag.java
@@ -71,19 +71,15 @@ public class SparkEoscTag {
 
 	}
 
-	public static <R extends Result> R tagForSoftware(Result s){
+	public static <R extends Result> R tagForSoftware(R s){
+		if (!Optional.ofNullable(s.getEoscifguidelines()).isPresent())
+			s.setEoscifguidelines(new ArrayList<>());
 		if (containsCriteriaNotebook(s)) {
-			if (!Optional.ofNullable(s.getEoscifguidelines()).isPresent())
-				s.setEoscifguidelines(new ArrayList<>());
 			addEIG(
 					s.getEoscifguidelines(), EOSC_JUPYTER_NOTEBOOK, EOSC_JUPYTER_NOTEBOOK, "",
 					COMPLIES_WITH);
-
 		}
 		if (containsCriteriaGalaxy(s)) {
-			if (!Optional.ofNullable(s.getEoscifguidelines()).isPresent())
-				s.setEoscifguidelines(new ArrayList<>());
-
 			addEIG(
 					s.getEoscifguidelines(), EOSC_GALAXY_WORKFLOW, EOSC_GALAXY_WORKFLOW, "", COMPLIES_WITH);
 		}