diff --git a/src/Appwrite/Platform/Modules/VCS/Http/Installations/Repositories/Branches/XList.php b/src/Appwrite/Platform/Modules/VCS/Http/Installations/Repositories/Branches/XList.php
index fda462159f..7909dbc47f 100644
--- a/src/Appwrite/Platform/Modules/VCS/Http/Installations/Repositories/Branches/XList.php
+++ b/src/Appwrite/Platform/Modules/VCS/Http/Installations/Repositories/Branches/XList.php
@@ -7,7 +7,6 @@ use Appwrite\Platform\Action;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\Method;
 use Appwrite\SDK\Response as SDKResponse;
-use Appwrite\Utopia\Database\Validator\Queries\Branches;
 use Appwrite\Utopia\Response;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
@@ -15,6 +14,7 @@ use Utopia\Database\Exception\Query as QueryException;
 use Utopia\Database\Query;
 use Utopia\Platform\Scope\HTTP;
 use Utopia\System\System;
+use Utopia\Validator\ArrayList;
 use Utopia\Validator\Text;
 use Utopia\VCS\Adapter\Git\GitHub;
 use Utopia\VCS\Exception\RepositoryNotFound;
@@ -53,7 +53,7 @@ class XList extends Action
             ->param('installationId', '', new Text(256), 'Installation Id')
             ->param('providerRepositoryId', '', new Text(256), 'Repository Id')
             ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
-            ->param('queries', [], new Branches(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Only supported methods are limit, offset, cursorAfter, and cursorBefore', true)
+            ->param('queries', [], new ArrayList(new Text(APP_LIMIT_ARRAY_ELEMENT_SIZE), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Only supported methods are limit, offset, cursorAfter, and cursorBefore', true)
             ->inject('gitHub')
             ->inject('response')
             ->inject('dbForPlatform')
@@ -75,6 +75,19 @@ class XList extends Action
             throw new Exception(Exception::GENERAL_QUERY_INVALID, $e->getMessage());
         }
 
+        $allowedQueryMethods = [
+            Query::TYPE_LIMIT,
+            Query::TYPE_OFFSET,
+            Query::TYPE_CURSOR_AFTER,
+            Query::TYPE_CURSOR_BEFORE,
+        ];
+
+        foreach ($queries as $query) {
+            if (!\in_array($query->getMethod(), $allowedQueryMethods, true)) {
+                throw new Exception(Exception::GENERAL_QUERY_INVALID, 'Only limit, offset, cursorAfter, and cursorBefore queries are supported.');
+            }
+        }
+
         $installation = $dbForPlatform->getDocument('installations', $installationId);
 
         if ($installation->isEmpty()) {
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Branches.php b/src/Appwrite/Utopia/Database/Validator/Queries/Branches.php
deleted file mode 100644
index 82ca911747..0000000000
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Branches.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace Appwrite\Utopia\Database\Validator\Queries;
-
-use Appwrite\Utopia\Database\Validator\Query\BranchCursor;
-use Utopia\Database\Validator\Queries;
-use Utopia\Database\Validator\Query\Limit;
-use Utopia\Database\Validator\Query\Offset;
-
-class Branches extends Queries
-{
-    public function __construct()
-    {
-        parent::__construct([
-            new Limit(),
-            new Offset(),
-            new BranchCursor(),
-        ]);
-    }
-}
diff --git a/src/Appwrite/Utopia/Database/Validator/Query/BranchCursor.php b/src/Appwrite/Utopia/Database/Validator/Query/BranchCursor.php
deleted file mode 100644
index 86ad324200..0000000000
--- a/src/Appwrite/Utopia/Database/Validator/Query/BranchCursor.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace Appwrite\Utopia\Database\Validator\Query;
-
-use Utopia\Database\Query;
-use Utopia\Database\Validator\Query\Base;
-use Utopia\Validator\Text;
-
-class BranchCursor extends Base
-{
-    public function isValid($value): bool
-    {
-        if (!$value instanceof Query) {
-            return false;
-        }
-
-        $method = $value->getMethod();
-
-        if (!\in_array($method, [Query::TYPE_CURSOR_AFTER, Query::TYPE_CURSOR_BEFORE], true)) {
-            $this->message = 'Invalid query method: ' . $method;
-            return false;
-        }
-
-        $cursor = $value->getValue();
-
-        $validator = new Text(256);
-        if (!$validator->isValid($cursor)) {
-            $this->message = 'Invalid cursor: ' . $validator->getDescription();
-            return false;
-        }
-
-        return true;
-    }
-
-    public function getMethodType(): string
-    {
-        return self::METHOD_TYPE_CURSOR;
-    }
-}