diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 6caf699..f5599c0 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -3,6 +3,9 @@
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+        <dependent-module archiveName="ckan-util-library-2.2.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/ckan-util-library/ckan-util-library">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
         <property name="context-root" value="grsf-publisher-ws"/>
         <property name="java-output-path" value="/grsf-publisher-ws/target/classes"/>
     </wb-module>
diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherFisheryService.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherFisheryService.java
index 6b71e64..3883f8b 100644
--- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherFisheryService.java
+++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherFisheryService.java
@@ -190,6 +190,7 @@ public class GrsfPublisherFisheryService {
 						Map<String, List<String>> customFields = record.getExtrasFields();
 						Set<String> tags = new HashSet<String>();						
 						Set<String> groups = new HashSet<String>();
+						groups.add(sourceInPath.getOrigName().toLowerCase() + "-" + Product_Type.FISHERY.getOrigName().toLowerCase()); //e.g. grsf-fishery
 						List<ResourceBean> resources = record.getExtrasResources();
 						boolean skipTags = !sourceInPath.equals(Sources.GRSF); // no tags for the Original records
 						CommonServiceUtils.getTagsGroupsResourcesExtrasByRecord(tags, skipTags, groups, resources, customFields, record, username, sourceInPath);
diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherStockService.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherStockService.java
index e80026e..5ee5022 100644
--- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherStockService.java
+++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherStockService.java
@@ -180,6 +180,7 @@ public class GrsfPublisherStockService {
 						Map<String, List<String>> customFields = record.getExtrasFields();
 						Set<String> tags = new HashSet<String>();						
 						Set<String> groups = new HashSet<String>();
+						groups.add(sourceInPath.getOrigName().toLowerCase() + "-" + Product_Type.STOCK.getOrigName().toLowerCase()); //e.g. grsf-stock
 						List<ResourceBean> resources = record.getExtrasResources();
 						boolean skipTags = !sourceInPath.equals(Sources.GRSF); // no tags for the Original records
 						CommonServiceUtils.getTagsGroupsResourcesExtrasByRecord(tags, skipTags, groups, resources, customFields, record, username, sourceInPath);