diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 5d10d39..671fd1c 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -3,7 +3,7 @@
         <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.4.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/ckan-util-library/ckan-util-library">
+        <dependent-module archiveName="grsf-common-library-1.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/grsf-common-library/grsf-common-library">
             <dependency-type>uses</dependency-type>
         </dependent-module>
         <property name="context-root" value="grsf-publisher-ws"/>
diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/others/TimeSeriesBean.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/others/TimeSeriesBean.java
index 972ca58..1332299 100644
--- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/others/TimeSeriesBean.java
+++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/others/TimeSeriesBean.java
@@ -135,11 +135,11 @@ public class TimeSeriesBean<T, T1> implements Comparable<TimeSeriesBean<T, T1>>{
 	public String toString() {
 
 		String value = "" + this.value;
-		String unit = this.unit != null ? "Unit : " + this.unit : "";
-		String databaseSource = (this.databaseSource != null ? " - DB Source: " + this.databaseSource : "");
-		String dataOwner = (this.dataOwner != null ? " - Data Owner: " + this.dataOwner : "");
-		String referenceYear =  year >= 0 ? " - Ref. Year: " + year : "";
-		String reportingYearOrAssessment = (assessment != null ? " - Rep. Year or Assessment Id: " + assessment + "" : "");
+		String unit = (this.unit != null && !this.unit.toString().isEmpty() ? "Unit: " + this.unit : "");
+		String databaseSource = (this.databaseSource != null && !this.databaseSource.toString().isEmpty()? " - DB Source: " + this.databaseSource : "");
+		String dataOwner = (this.dataOwner != null && !this.dataOwner.toString().isEmpty()? " - Data Owner: " + this.dataOwner : "");
+		String referenceYear =  year > 0 ? " - Ref. Year: " + year : "";
+		String reportingYearOrAssessment = (assessment != null && !this.assessment.toString().isEmpty()? " - Rep. Year or Assessment Id: " + assessment + "" : "");
 		String partial = value + " [" + 
 				unit + 
 				reportingYearOrAssessment +