diff --git a/AI/NetApp-KnowledgeBase-MCP-server/src/index.ts b/AI/NetApp-KnowledgeBase-MCP-server/src/index.ts
index 1d24bd5..e77e71e 100644
--- a/AI/NetApp-KnowledgeBase-MCP-server/src/index.ts
+++ b/AI/NetApp-KnowledgeBase-MCP-server/src/index.ts
@@ -19,7 +19,8 @@ async function startServer() {
     logger.info('Received knowledge bases', JSON.stringify(knowledgeBases, null, 2) , 'defining tools');
     knowledgeBases.forEach(knowledgeBase => {
         const {id: knowledgeBaseId, name, description} = knowledgeBase;
-        server.tool(`search_KB_${name}`, `Search knowledge base with description ${description}`, {
+        const toolName = `search_KB_${name}`.slice(0, 64).replaceAll(/[^a-zA-Z0-9_-]/g,'_'); // MCP tool names should be less than 64 characters
+        server.tool(toolName, `Search knowledge base with description ${description}`, {
             question: z.string({description: 'Question to search the answer to in the knowledge base'})
         }, async ({question}) => {
             try {
diff --git a/AI/NetApp-KnowledgeBase-MCP-server/src/lib/netapp/wlmai/wlmai.ts b/AI/NetApp-KnowledgeBase-MCP-server/src/lib/netapp/wlmai/wlmai.ts
index 62af624..f4a0604 100644
--- a/AI/NetApp-KnowledgeBase-MCP-server/src/lib/netapp/wlmai/wlmai.ts
+++ b/AI/NetApp-KnowledgeBase-MCP-server/src/lib/netapp/wlmai/wlmai.ts
@@ -72,11 +72,12 @@ export async function getAiEngines(){
     return deployments;
 }
 
-export async function getKnowledgeBases( deploymentId:string){
+export async function getKnowledgeBases( deploymentId:string, token?:string){
     const {knowledgeBases = [], nextToken}  = await got.get(`${WLMAI_URL}/accounts/${process.env.ACCOUNT_ID}/wlmai/v2/deployments/${deploymentId}/knowledge-bases`, {
         headers:{
             authorization: await getToken()
-        }
+        },
+        searchParams: token ? {token} : {}
     }).json<{knowledgeBases:KnowledgeBase[], nextToken?:string}>()
     return {knowledgeBases, nextToken};
 }
diff --git a/AI/NetApp-KnowledgeBase-MCP-server/src/operations/wlmai-operations.ts b/AI/NetApp-KnowledgeBase-MCP-server/src/operations/wlmai-operations.ts
index 6c65920..b4bce35 100644
--- a/AI/NetApp-KnowledgeBase-MCP-server/src/operations/wlmai-operations.ts
+++ b/AI/NetApp-KnowledgeBase-MCP-server/src/operations/wlmai-operations.ts
@@ -4,10 +4,9 @@ async function* getKnowledgeBasesGenerator(aiEngineId:string){
     let { knowledgeBases, nextToken } = await getKnowledgeBases(aiEngineId);
     yield knowledgeBases;
     while (nextToken) {
-        ({ knowledgeBases, nextToken } = await getKnowledgeBases(aiEngineId));
+        ({ knowledgeBases, nextToken } = await getKnowledgeBases(aiEngineId, nextToken));
         yield knowledgeBases;
     }
-
 }
 
 async function listAllKnowledgeBases(aiEngineId:string){