diff --git a/generator/config/stage/search.yaml b/generator/config/stage/search.yaml
index 5f3c925e1..3fc55458e 100644
--- a/generator/config/stage/search.yaml
+++ b/generator/config/stage/search.yaml
@@ -21,7 +21,7 @@ arguments:
         type:
             - string
         description: |
-            Name of the Atlas Search index to use. If omitted, defaults to default.
+            Name of the Atlas Search index to use. If omitted, defaults to "default".
     -
         name: highlight
         optional: true
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 10cccfa2c..beda94f42 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -60,9 +60,14 @@
     </NoInterfaceProperties>
   </file>
   <file src="src/Builder/Encoder/OperatorEncoder.php">
+    <ArgumentTypeCoercion>
+      <code><![CDATA[$value]]></code>
+      <code><![CDATA[$value]]></code>
+    </ArgumentTypeCoercion>
     <MixedAssignment>
       <code><![CDATA[$result]]></code>
       <code><![CDATA[$result[]]]></code>
+      <code><![CDATA[$subkey]]></code>
       <code><![CDATA[$subval]]></code>
       <code><![CDATA[$val]]></code>
       <code><![CDATA[$val]]></code>
@@ -71,6 +76,9 @@
       <code><![CDATA[$val]]></code>
       <code><![CDATA[$val]]></code>
     </MixedAssignment>
+    <RawObjectIteration>
+      <code><![CDATA[$val]]></code>
+    </RawObjectIteration>
   </file>
   <file src="src/Builder/Encoder/OutputWindowEncoder.php">
     <MixedArgument>
diff --git a/src/Builder/Stage/FactoryTrait.php b/src/Builder/Stage/FactoryTrait.php
index 388a64c1c..5b1f47a8c 100644
--- a/src/Builder/Stage/FactoryTrait.php
+++ b/src/Builder/Stage/FactoryTrait.php
@@ -540,7 +540,7 @@ public static function sample(int $size): SampleStage
      * @see https://www.mongodb.com/docs/manual/reference/operator/aggregation/search/
      * @param Document|SearchOperatorInterface|Serializable|array|stdClass $operator Operator to search with.  You can provide a specific operator or use
      * the compound operator to run a compound query with multiple operators.
-     * @param Optional|string $index Name of the Atlas Search index to use. If omitted, defaults to default.
+     * @param Optional|string $index Name of the Atlas Search index to use. If omitted, defaults to "default".
      * @param Optional|Document|Serializable|array|stdClass $highlight Specifies the highlighting options for displaying search terms in their original context.
      * @param Optional|bool $concurrent Parallelize search across segments on dedicated search nodes.
      * If you don't have separate search nodes on your cluster,
diff --git a/src/Builder/Stage/FluentFactoryTrait.php b/src/Builder/Stage/FluentFactoryTrait.php
index 14babcc6e..e2858bdde 100644
--- a/src/Builder/Stage/FluentFactoryTrait.php
+++ b/src/Builder/Stage/FluentFactoryTrait.php
@@ -608,7 +608,7 @@ public function sample(int $size): static
      * @see https://www.mongodb.com/docs/manual/reference/operator/aggregation/search/
      * @param Document|SearchOperatorInterface|Serializable|array|stdClass $operator Operator to search with.  You can provide a specific operator or use
      * the compound operator to run a compound query with multiple operators.
-     * @param Optional|string $index Name of the Atlas Search index to use. If omitted, defaults to default.
+     * @param Optional|string $index Name of the Atlas Search index to use. If omitted, defaults to "default".
      * @param Optional|Document|Serializable|array|stdClass $highlight Specifies the highlighting options for displaying search terms in their original context.
      * @param Optional|bool $concurrent Parallelize search across segments on dedicated search nodes.
      * If you don't have separate search nodes on your cluster,
diff --git a/src/Builder/Stage/SearchStage.php b/src/Builder/Stage/SearchStage.php
index 65043c77d..76f04d5db 100644
--- a/src/Builder/Stage/SearchStage.php
+++ b/src/Builder/Stage/SearchStage.php
@@ -33,7 +33,7 @@ class SearchStage implements StageInterface, OperatorInterface
      */
     public readonly Document|Serializable|SearchOperatorInterface|stdClass|array $operator;
 
-    /** @var Optional|string $index Name of the Atlas Search index to use. If omitted, defaults to default. */
+    /** @var Optional|string $index Name of the Atlas Search index to use. If omitted, defaults to "default". */
     public readonly Optional|string $index;
 
     /** @var Optional|Document|Serializable|array|stdClass $highlight Specifies the highlighting options for displaying search terms in their original context. */
@@ -70,7 +70,7 @@ class SearchStage implements StageInterface, OperatorInterface
     /**
      * @param Document|SearchOperatorInterface|Serializable|array|stdClass $operator Operator to search with.  You can provide a specific operator or use
      * the compound operator to run a compound query with multiple operators.
-     * @param Optional|string $index Name of the Atlas Search index to use. If omitted, defaults to default.
+     * @param Optional|string $index Name of the Atlas Search index to use. If omitted, defaults to "default".
      * @param Optional|Document|Serializable|array|stdClass $highlight Specifies the highlighting options for displaying search terms in their original context.
      * @param Optional|bool $concurrent Parallelize search across segments on dedicated search nodes.
      * If you don't have separate search nodes on your cluster,