diff --git a/infra/main.bicep b/infra/main.bicep
index 2a2c6cdd7..55c1c0682 100644
--- a/infra/main.bicep
+++ b/infra/main.bicep
@@ -1525,7 +1525,7 @@ module containerApp 'br/public:avm/res/app/container-app:0.18.1' = {
           }
           {
             name: 'AZURE_AI_SEARCH_CONNECTION_NAME'
-            value: searchService.outputs.name
+            value: aiSearchConnectionName
           }
           {
             name: 'AZURE_AI_SEARCH_INDEX_NAME'
@@ -2041,7 +2041,7 @@ output COSMOSDB_ACCOUNT_NAME string = cosmosDbResourceName
 output AZURE_SEARCH_ENDPOINT string =searchService.outputs.endpoint
 output AZURE_CLIENT_ID string  = userAssignedIdentity!.outputs.clientId
 output AZURE_TENANT_ID string = tenant().tenantId
-output AZURE_AI_SEARCH_CONNECTION_NAME string  = searchService.outputs.name
+output AZURE_AI_SEARCH_CONNECTION_NAME string  = aiSearchConnectionName
 output AZURE_COGNITIVE_SERVICES string = 'https://cognitiveservices.azure.com/.default'
 output REASONING_MODEL_NAME string = aiFoundryAiServicesReasoningModelDeployment.name
 output MCP_SERVER_NAME string = 'MACAE MCP Server'
diff --git a/infra/main_custom.bicep b/infra/main_custom.bicep
index c7688d0c7..06868a45f 100644
--- a/infra/main_custom.bicep
+++ b/infra/main_custom.bicep
@@ -1556,7 +1556,7 @@ module containerApp 'br/public:avm/res/app/container-app:0.18.1' = {
           }
           {
             name: 'AZURE_AI_SEARCH_CONNECTION_NAME'
-            value: searchService.outputs.name
+            value: aiSearchConnectionName
           }
           {
             name: 'AZURE_AI_SEARCH_INDEX_NAME'
@@ -2096,7 +2096,7 @@ output COSMOSDB_ACCOUNT_NAME string = cosmosDbResourceName
 output AZURE_SEARCH_ENDPOINT string =searchService.outputs.endpoint
 output AZURE_CLIENT_ID string  = userAssignedIdentity!.outputs.clientId
 output AZURE_TENANT_ID string = tenant().tenantId
-output AZURE_AI_SEARCH_CONNECTION_NAME string  = searchService.outputs.name
+output AZURE_AI_SEARCH_CONNECTION_NAME string  = aiSearchConnectionName
 output AZURE_COGNITIVE_SERVICES string = 'https://cognitiveservices.azure.com/.default'
 output REASONING_MODEL_NAME string =  aiFoundryAiServicesReasoningModelDeployment.name
 output MCP_SERVER_NAME string = 'MACAE MCP Server'
diff --git a/infra/scripts/index_datasets.py b/infra/scripts/index_datasets.py
index d0acfe6a5..480407382 100644
--- a/infra/scripts/index_datasets.py
+++ b/infra/scripts/index_datasets.py
@@ -48,23 +48,24 @@
     sys.exit(1)
 
 for idx, blob in enumerate(blob_list, start=1):
-    if blob.name.endswith(".csv"):
-        title = blob.name.replace(".csv", "")
-        csv_data = container_client.download_blob(blob.name).readall()
-        
-        try:
-            print(f"Reading data from blob: {blob.name}...")
-            csv_text = csv_data.decode('utf-8')
-            data_list.append({
-                "content": csv_text,
-                "id": str(idx),
-                "title": title
-            })
-            success_count += 1
-        except Exception as e:
-            print(f"Error reading CSV file - {blob.name}: {e}")
-            fail_count += 1
-            continue
+    #if blob.name.endswith(".csv"):
+    title = blob.name.replace(".csv", "")
+    title = blob.name.replace(".json", "")
+    data = container_client.download_blob(blob.name).readall()
+    
+    try:
+        print(f"Reading data from blob: {blob.name}...")
+        text = data.decode('utf-8')
+        data_list.append({
+            "content": text,
+            "id": str(idx),
+            "title": title
+        })
+        success_count += 1
+    except Exception as e:
+        print(f"Error reading file - {blob.name}: {e}")
+        fail_count += 1
+        continue
 
 if not data_list:
     print(f"No data to upload to Azure Search index. Success: {success_count}, Failed: {fail_count}")