diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/CommonServiceUtils.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/CommonServiceUtils.java
index 9a33a88..4312d63 100644
--- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/CommonServiceUtils.java
+++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/CommonServiceUtils.java
@@ -182,7 +182,7 @@ public class CommonServiceUtils {
 							// check if it is a time series, in this take the last X elements
 							if(asList.get(0).getClass().equals(TimeSeriesBean.class)){
 								elementsToConsider = Math.min(elementsToConsider, Constants.TIME_SERIES_TAKE_LAST_VALUES);
-								for (int i = (asList.size() - elementsToConsider); i < asList.size(); i++) {
+								for (int i = 0; i < elementsToConsider; i++) {
 									String finalTag = asList.get(i).toString().trim().replaceAll(Constants.REGEX_TAGS, "");
 									if(finalTag.length() <= TAG_MAX_SIZE)
 										tags.add(finalTag);	
@@ -288,8 +288,7 @@ public class CommonServiceUtils {
 							// check if it is a time series, in this case take the last X elements 
 							if(asList.get(0).getClass().equals(TimeSeriesBean.class)){
 								elementsToConsider = Math.min(elementsToConsider, Constants.TIME_SERIES_TAKE_LAST_VALUES);
-
-								for (int i = (asList.size() - elementsToConsider); i < asList.size(); i++) {
+								for (int i = 0; i < elementsToConsider; i++) {
 									// trim and remove html
 									String clean = HelperMethods.removeHTML(asList.get(i).toString().trim()); 
 									valuesForKey.add(clean);