diff --git a/src/main/java/org/etsi/osl/mcp/server/ProductCatalogTools.java b/src/main/java/org/etsi/osl/mcp/server/ProductCatalogTools.java
index f47f1597ade0ed3ec23628835a282b5ea9d57a54..8d966452e2451de547a8515ef2072429c9c4c351 100644
--- a/src/main/java/org/etsi/osl/mcp/server/ProductCatalogTools.java
+++ b/src/main/java/org/etsi/osl/mcp/server/ProductCatalogTools.java
@@ -177,7 +177,7 @@ public class ProductCatalogTools {
     // Filter and get result as JSON string
     try {
 
-      String[] tokens = {"id", "name", "description", "isBundle", "@type", "configurable", "valueType", "isBundle" };
+      String[] tokens = {"productOfferingId", "productName", "productDescription", "isBundle", "@type", "isBundle", "categoryName" };
       JsonNode filtered = JsonMassage.filterJsonByTokens( spec, tokens);
       return filtered;
     } catch (Exception e) {
diff --git a/src/main/java/org/etsi/osl/mcp/server/ServiceCatalogTools.java b/src/main/java/org/etsi/osl/mcp/server/ServiceCatalogTools.java
index 365fb6b54b7263769d48ab95ca93c06c99dde720..0508f4003d574ea6e3b62abade0ab36f45683cee 100644
--- a/src/main/java/org/etsi/osl/mcp/server/ServiceCatalogTools.java
+++ b/src/main/java/org/etsi/osl/mcp/server/ServiceCatalogTools.java
@@ -31,10 +31,12 @@ import org.etsi.osl.tmf.so641.model.ServiceOrderStateType;
 import org.etsi.osl.tmf.so641.model.ServiceRestriction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.ai.chat.model.ToolContext;
 import org.springframework.ai.tool.annotation.Tool;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.ParameterizedTypeReference;
+//import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.client.RestClient;
 import jakarta.validation.Valid;
 
@@ -55,6 +57,13 @@ public class ServiceCatalogTools {
   ServiceCatalogQClient aCatalogClient;
 
   
+//  @Tool(description="Get your name")
+//  public String getYourName(ToolContext context) {
+//    logger.info("ToolContext: {}", McpRequestHolder.get(context).headers());
+//      return SecurityContextHolder.getContext().getAuthentication().getName();
+//  }
+  
+  
   @Tool(description = "Get a list of all published OSL OpenSlice service catalogs."
       + "Each catalog contains service categories, that we can search individually to get the details and contents of each category.")
   public JsonNode getOSLServiceCatalogs() {
@@ -191,7 +200,7 @@ public class ServiceCatalogTools {
     // Filter and get result as JSON string
     try {
 
-      String[] tokens = {"id", "name", "description", "@type", "configurable", "valueType", "isBundle" };
+      String[] tokens = {"serviceSpecificationId", "serviceName", "serviceDescription", "@type",  "isBundle", "categoryName" };
       JsonNode filtered = JsonMassage.filterJsonByTokens( spec, tokens);
       return filtered;
     } catch (Exception e) {