diff --git a/packages/components/nodes/agents/ConversationalRetrievalAgent/ConversationalRetrievalAgent.ts b/packages/components/nodes/agents/ConversationalRetrievalAgent/ConversationalRetrievalAgent.ts
index 4a908d7fe..7b71cb5f8 100644
--- a/packages/components/nodes/agents/ConversationalRetrievalAgent/ConversationalRetrievalAgent.ts
+++ b/packages/components/nodes/agents/ConversationalRetrievalAgent/ConversationalRetrievalAgent.ts
@@ -21,7 +21,7 @@ class ConversationalRetrievalAgent_Agents implements INode {
     constructor() {
         this.label = 'Conversational Retrieval Agent'
         this.name = 'conversationalRetrievalAgent'
-        this.version = 1.0
+        this.version = 2.0
         this.type = 'AgentExecutor'
         this.category = 'Agents'
         this.icon = 'agent.svg'
@@ -40,9 +40,9 @@ class ConversationalRetrievalAgent_Agents implements INode {
                 type: 'BaseChatMemory'
             },
             {
-                label: 'OpenAI Chat Model',
+                label: 'OpenAI/Azure Chat Model',
                 name: 'model',
-                type: 'ChatOpenAI'
+                type: 'ChatOpenAI | AzureChatOpenAI'
             },
             {
                 label: 'System Message',
diff --git a/packages/components/nodes/agents/OpenAIFunctionAgent/OpenAIFunctionAgent.ts b/packages/components/nodes/agents/OpenAIFunctionAgent/OpenAIFunctionAgent.ts
index c920c399e..ce6f576fc 100644
--- a/packages/components/nodes/agents/OpenAIFunctionAgent/OpenAIFunctionAgent.ts
+++ b/packages/components/nodes/agents/OpenAIFunctionAgent/OpenAIFunctionAgent.ts
@@ -20,11 +20,11 @@ class OpenAIFunctionAgent_Agents implements INode {
     constructor() {
         this.label = 'OpenAI Function Agent'
         this.name = 'openAIFunctionAgent'
-        this.version = 1.0
+        this.version = 2.0
         this.type = 'AgentExecutor'
         this.category = 'Agents'
         this.icon = 'openai.png'
-        this.description = `An agent that uses OpenAI's Function Calling functionality to pick the tool and args to call`
+        this.description = `An agent that uses Function Calling to pick the tool and args to call`
         this.baseClasses = [this.type, ...getBaseClasses(AgentExecutor)]
         this.inputs = [
             {
@@ -39,11 +39,9 @@ class OpenAIFunctionAgent_Agents implements INode {
                 type: 'BaseChatMemory'
             },
             {
-                label: 'OpenAI Chat Model',
+                label: 'OpenAI/Azure Chat Model',
                 name: 'model',
-                description:
-                    'Only works with gpt-3.5-turbo-0613 and gpt-4-0613. Refer <a target="_blank" href="https://platform.openai.com/docs/guides/gpt/function-calling">docs</a> for more info',
-                type: 'BaseChatModel'
+                type: 'ChatOpenAI | AzureChatOpenAI'
             },
             {
                 label: 'System Message',
diff --git a/packages/server/marketplaces/chatflows/API Agent OpenAI.json b/packages/server/marketplaces/chatflows/API Agent OpenAI.json
index 5498b4f36..4950a6a66 100644
--- a/packages/server/marketplaces/chatflows/API Agent OpenAI.json	
+++ b/packages/server/marketplaces/chatflows/API Agent OpenAI.json	
@@ -334,7 +334,7 @@
                 "id": "openAIFunctionAgent_0",
                 "label": "OpenAI Function Agent",
                 "name": "openAIFunctionAgent",
-                "version": 1,
+                "version": 2,
                 "type": "AgentExecutor",
                 "baseClasses": ["AgentExecutor", "BaseChain"],
                 "category": "Agents",
@@ -365,11 +365,10 @@
                         "id": "openAIFunctionAgent_0-input-memory-BaseChatMemory"
                     },
                     {
-                        "label": "OpenAI Chat Model",
+                        "label": "OpenAI/Azure Chat Model",
                         "name": "model",
-                        "description": "Only works with gpt-3.5-turbo-0613 and gpt-4-0613. Refer <a target=\"_blank\" href=\"https://platform.openai.com/docs/guides/gpt/function-calling\">docs</a> for more info",
-                        "type": "BaseChatModel",
-                        "id": "openAIFunctionAgent_0-input-model-BaseChatModel"
+                        "type": "ChatOpenAI | AzureChatOpenAI",
+                        "id": "openAIFunctionAgent_0-input-model-ChatOpenAI | AzureChatOpenAI"
                     }
                 ],
                 "inputs": {
diff --git a/packages/server/marketplaces/chatflows/Conversational Retrieval Agent.json b/packages/server/marketplaces/chatflows/Conversational Retrieval Agent.json
index aafc8e8e2..800ae3000 100644
--- a/packages/server/marketplaces/chatflows/Conversational Retrieval Agent.json	
+++ b/packages/server/marketplaces/chatflows/Conversational Retrieval Agent.json	
@@ -98,7 +98,7 @@
             "data": {
                 "id": "conversationalRetrievalAgent_0",
                 "label": "Conversational Retrieval Agent",
-                "version": 1,
+                "version": 2,
                 "name": "conversationalRetrievalAgent",
                 "type": "AgentExecutor",
                 "baseClasses": ["AgentExecutor", "BaseChain", "Runnable"],
@@ -130,10 +130,10 @@
                         "id": "conversationalRetrievalAgent_0-input-memory-BaseChatMemory"
                     },
                     {
-                        "label": "OpenAI Chat Model",
+                        "label": "OpenAI/Azure Chat Model",
                         "name": "model",
-                        "type": "ChatOpenAI",
-                        "id": "conversationalRetrievalAgent_0-input-model-ChatOpenAI"
+                        "type": "ChatOpenAI | AzureChatOpenAI",
+                        "id": "conversationalRetrievalAgent_0-input-model-ChatOpenAI | AzureChatOpenAI"
                     }
                 ],
                 "inputs": {
diff --git a/packages/server/marketplaces/chatflows/OpenAI Agent.json b/packages/server/marketplaces/chatflows/OpenAI Agent.json
index a4944af09..bc27a9fe8 100644
--- a/packages/server/marketplaces/chatflows/OpenAI Agent.json	
+++ b/packages/server/marketplaces/chatflows/OpenAI Agent.json	
@@ -206,7 +206,7 @@
                 "id": "openAIFunctionAgent_0",
                 "label": "OpenAI Function Agent",
                 "name": "openAIFunctionAgent",
-                "version": 1,
+                "version": 2,
                 "type": "AgentExecutor",
                 "baseClasses": ["AgentExecutor", "BaseChain"],
                 "category": "Agents",
@@ -237,11 +237,10 @@
                         "id": "openAIFunctionAgent_0-input-memory-BaseChatMemory"
                     },
                     {
-                        "label": "OpenAI Chat Model",
+                        "label": "OpenAI/Azure Chat Model",
                         "name": "model",
-                        "description": "Only works with gpt-3.5-turbo-0613 and gpt-4-0613. Refer <a target=\"_blank\" href=\"https://platform.openai.com/docs/guides/gpt/function-calling\">docs</a> for more info",
-                        "type": "BaseChatModel",
-                        "id": "openAIFunctionAgent_0-input-model-BaseChatModel"
+                        "type": "ChatOpenAI | AzureChatOpenAI",
+                        "id": "openAIFunctionAgent_0-input-model-ChatOpenAI | AzureChatOpenAI"
                     }
                 ],
                 "inputs": {
diff --git a/packages/ui/src/views/canvas/AddNodes.js b/packages/ui/src/views/canvas/AddNodes.js
index 0973cdda4..7bf3e7ff0 100644
--- a/packages/ui/src/views/canvas/AddNodes.js
+++ b/packages/ui/src/views/canvas/AddNodes.js
@@ -68,10 +68,14 @@ const AddNodes = ({ nodesData, node }) => {
             else newNodes.push(vsNode)
         }
         delete obj['Vector Stores']
-        obj['Vector Stores;DEPRECATING'] = deprecatingNodes
-        accordianCategories['Vector Stores;DEPRECATING'] = isFilter ? true : false
-        obj['Vector Stores;NEW'] = newNodes
-        accordianCategories['Vector Stores;NEW'] = isFilter ? true : false
+        if (deprecatingNodes.length) {
+            obj['Vector Stores;DEPRECATING'] = deprecatingNodes
+            accordianCategories['Vector Stores;DEPRECATING'] = isFilter ? true : false
+        }
+        if (newNodes.length) {
+            obj['Vector Stores;NEW'] = newNodes
+            accordianCategories['Vector Stores;NEW'] = isFilter ? true : false
+        }
         setNodes(obj)
     }