diff --git a/NOTICE.txt b/NOTICE.txt
index d245510d..24ad4c9d 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -231,7 +231,7 @@ limitations under the License.
 
 ---------------------------------------------------------
 
-Azure.AI.OpenAI 1.0.0-beta.6 - MIT
+Azure.AI.OpenAI 1.0.0-beta.7 - MIT
 
 
 (c) Microsoft Corporation
diff --git a/src/ai/.x/help/chat b/src/ai/.x/help/chat
index ffd4805b..6abe204a 100644
--- a/src/ai/.x/help/chat
+++ b/src/ai/.x/help/chat
@@ -60,7 +60,7 @@ EXAMPLES
 
     ai config @myindex --set MyIndex
     ai search index create --name @myindex --files *.txt --interactive
-    ai chat --index @myindex --interactive
+    ai chat --search-index @myindex --interactive
 
 SEE ALSO
 
diff --git a/src/ai/BuildCommon.targets b/src/ai/BuildCommon.targets
index 24a9e339..e799601b 100644
--- a/src/ai/BuildCommon.targets
+++ b/src/ai/BuildCommon.targets
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <CLIAssemblyVersion>1.0.0</CLIAssemblyVersion>
-    <DefaultPublicOAISDKVersion>1.0.0-beta.6</DefaultPublicOAISDKVersion>
+    <DefaultPublicOAISDKVersion>1.0.0-beta.7</DefaultPublicOAISDKVersion>
     <OAISDKVersion Condition="'$(OAISDKVersion)' == ''">$(DefaultPublicOAISDKVersion)</OAISDKVersion>
     <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
   </PropertyGroup>
diff --git a/src/ai/commands/chat_command.cs b/src/ai/commands/chat_command.cs
index 7bdae5c4..4325c479 100644
--- a/src/ai/commands/chat_command.cs
+++ b/src/ai/commands/chat_command.cs
@@ -239,6 +239,19 @@ private ChatCompletionsOptions CreateChatCompletionOptions()
                 stops.ForEach(s => options.StopSequences.Add(s));
             }
 
+            var searchKey = _values["service.config.search.api.key"];
+            var searchEndpoint = _values["service.config.search.endpoint.uri"];
+            var indexName = _values["service.config.search.index.name"];
+            var searchExtensionOk = !string.IsNullOrEmpty(searchKey) && !string.IsNullOrEmpty(searchEndpoint) && !string.IsNullOrEmpty(indexName);
+            if (searchExtensionOk)
+            {
+                var acsOptions = new AzureCognitiveSearchChatExtensionConfiguration(AzureChatExtensionType.AzureCognitiveSearch, new Uri(searchEndpoint), new AzureKeyCredential(searchKey), indexName);
+                var extensionOptions = new AzureChatExtensionsOptions();
+                extensionOptions.Extensions.Add(acsOptions);
+
+                options.AzureExtensionsOptions = extensionOptions;
+            }
+
             return options;
         }
 
diff --git a/src/ai/commands/parsers/chat_command_parser.cs b/src/ai/commands/parsers/chat_command_parser.cs
index 3e1e442c..ebbb8cc1 100644
--- a/src/ai/commands/parsers/chat_command_parser.cs
+++ b/src/ai/commands/parsers/chat_command_parser.cs
@@ -37,10 +37,10 @@ public static bool ParseCommandValues(INamedValueTokens tokens, ICommandValues v
             new NamedValueTokenParser("--deployment", "service.config.deployment", "001", "1"),
 
             new NamedValueTokenParser(null,             "service.config.embeddings.deployment", "0010", "1"),
-            new NamedValueTokenParser(null,             "service.config.embeddings.index.name", "00010", "1"),
 
             new NamedValueTokenParser(null,             "service.config.search.api.key", "00101", "1"),
             new NamedValueTokenParser(null,             "service.config.search.endpoint.uri", "00110;00101", "1"),
+            new NamedValueTokenParser(null,             "service.config.search.index.name", "00010", "1"),
 
             new NamedValueTokenParser("--interactive",  "chat.input.interactive", "001", "0", null, null, "true"),