From 76a00536d6a84c16ffb86d3dd268dc3f0422984c Mon Sep 17 00:00:00 2001
From: "francois-charles.heb" <francois-charles.hebert@dialogs.ca>
Date: Wed, 16 Jul 2025 13:21:57 -0400
Subject: [PATCH] apply fix from issue #66

---
 src/QueryBuilderParser/QueryBuilderParser.php | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/QueryBuilderParser/QueryBuilderParser.php b/src/QueryBuilderParser/QueryBuilderParser.php
index f7e30de..4924e6b 100644
--- a/src/QueryBuilderParser/QueryBuilderParser.php
+++ b/src/QueryBuilderParser/QueryBuilderParser.php
@@ -79,11 +79,17 @@ protected function loopThroughRules(array $rules, EloquentBuilder|Builder $query
             /*
              * If makeQuery does not see the correct fields, it will return the QueryBuilder without modifications
              */
-            $querybuilder = $this->makeQuery($querybuilder, $rule, $queryCondition);
-
-            if ($this->isNested($rule)) {
-                $querybuilder = $this->createNestedQuery($querybuilder, $rule, $queryCondition);
-            }
+            // $querybuilder = $this->makeQuery($querybuilder, $rule, $queryCondition);
+			//
+			// if ($this->isNested($rule)) {
+			// 	$querybuilder = $this->createNestedQuery($querybuilder, $rule, $queryCondition);
+			// }
+			
+			if ($this->isNested($rule)) {
+				$querybuilder = $this->createNestedQuery($querybuilder, $rule, $queryCondition);
+			} else {
+				$querybuilder = $this->makeQuery($querybuilder, $rule, $queryCondition);
+			}
         }
 
         return $querybuilder;