diff --git a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/plugins/SDIIndexerPlugin.java b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/plugins/SDIIndexerPlugin.java
index e2d0603..b942046 100644
--- a/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/plugins/SDIIndexerPlugin.java
+++ b/sdi-plugins/src/main/java/org/gcube/application/cms/sdi/plugins/SDIIndexerPlugin.java
@@ -216,7 +216,7 @@ public class SDIIndexerPlugin extends SDIAbstractPlugin implements IndexerPlugin
                 if(!foundValues.isEmpty())
                     toSetValue=foundValues.get(0);
                 log.trace("Setting {} = {} in centroid doc ",m.getName(),toSetValue);
-                centroidDoc.put(m.getName(),foundValues.get(0));
+                centroidDoc.put(m.getName(),toSetValue);
             }
 
             log.info("Inserting Centroid {} into {} ",centroidDoc.toJson(),indexer);
@@ -322,6 +322,7 @@ public class SDIIndexerPlugin extends SDIAbstractPlugin implements IndexerPlugin
                 log.trace("Mapping is {} ",mappingObj);
                 MappingObject m = Serialization.convert(mappingObj,MappingObject.class);
                 m.validate();
+                mappingObjects.add(m);
             }
         }
         return mappingObjects;