diff --git a/src/Appwrite/Platform/Modules/Functions/Http/Deployments/Duplicate/Create.php b/src/Appwrite/Platform/Modules/Functions/Http/Deployments/Duplicate/Create.php
index 642e88ecc2..8f739dd37f 100644
--- a/src/Appwrite/Platform/Modules/Functions/Http/Deployments/Duplicate/Create.php
+++ b/src/Appwrite/Platform/Modules/Functions/Http/Deployments/Duplicate/Create.php
@@ -104,7 +104,6 @@ class Create extends Action
             'totalSize' => $deployment->getAttribute('sourceSize', 0),
             'entrypoint' => $function->getAttribute('entrypoint'),
             'buildCommands' => $function->getAttribute('commands', ''),
-            'search' => implode(' ', [$deploymentId, $function->getAttribute('entrypoint')]),
             'buildStartedAt' => null,
             'buildEndedAt' => null,
             'buildDuration' => null,
diff --git a/src/Appwrite/Platform/Modules/Functions/Http/Deployments/Template/Create.php b/src/Appwrite/Platform/Modules/Functions/Http/Deployments/Template/Create.php
index 2984bab99a..55230bd4a5 100644
--- a/src/Appwrite/Platform/Modules/Functions/Http/Deployments/Template/Create.php
+++ b/src/Appwrite/Platform/Modules/Functions/Http/Deployments/Template/Create.php
@@ -147,7 +147,6 @@ class Create extends Base
             'entrypoint' => $function->getAttribute('entrypoint', ''),
             'buildCommands' => $function->getAttribute('commands', ''),
             'type' => 'manual',
-            'search' => implode(' ', [$deploymentId, $function->getAttribute('entrypoint', '')]),
             'activate' => $activate,
         ]));
 
diff --git a/src/Appwrite/Platform/Modules/Sites/Http/Deployments/Duplicate/Create.php b/src/Appwrite/Platform/Modules/Sites/Http/Deployments/Duplicate/Create.php
index fe4fd79e6b..bff0735328 100644
--- a/src/Appwrite/Platform/Modules/Sites/Http/Deployments/Duplicate/Create.php
+++ b/src/Appwrite/Platform/Modules/Sites/Http/Deployments/Duplicate/Create.php
@@ -120,7 +120,6 @@ class Create extends Action
             'buildOutput' => $site->getAttribute('outputDirectory', ''),
             'adapter' => $site->getAttribute('adapter', ''),
             'fallbackFile' => $site->getAttribute('fallbackFile', ''),
-            'search' => implode(' ', [$deploymentId]),
             'screenshotLight' => '',
             'screenshotDark' => '',
             'buildStartedAt' => null,
@@ -162,7 +161,6 @@ class Create extends Action
                 'deploymentResourceInternalId' => $site->getInternalId(),
                 'status' => 'verified',
                 'certificateId' => '',
-                'search' => implode(' ', [$ruleId, $domain]),
                 'owner' => 'Appwrite',
                 'region' => $project->getAttribute('region')
             ]))
diff --git a/src/Appwrite/Platform/Modules/Sites/Http/Deployments/Template/Create.php b/src/Appwrite/Platform/Modules/Sites/Http/Deployments/Template/Create.php
index 095525ac1d..5b29521ce5 100644
--- a/src/Appwrite/Platform/Modules/Sites/Http/Deployments/Template/Create.php
+++ b/src/Appwrite/Platform/Modules/Sites/Http/Deployments/Template/Create.php
@@ -160,7 +160,6 @@ class Create extends Base
             'adapter' => $site->getAttribute('adapter', ''),
             'fallbackFile' => $site->getAttribute('fallbackFile', ''),
             'type' => 'manual',
-            'search' => implode(' ', [$deploymentId]),
             'activate' => $activate,
         ]));
 
@@ -192,7 +191,6 @@ class Create extends Base
                 'deploymentResourceInternalId' => $site->getInternalId(),
                 'status' => 'verified',
                 'certificateId' => '',
-                'search' => implode(' ', [$ruleId, $domain]),
                 'owner' => 'Appwrite',
                 'region' => $project->getAttribute('region')
             ]))
diff --git a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php
index e3ef8f0fc8..6a8db0a88c 100644
--- a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php
+++ b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php
@@ -396,7 +396,7 @@ class FunctionsCustomServerTest extends Scope
         $deployment = $this->createTemplateDeployment(
             $functionId,
             [
-                'functionId' => ID::unique(),
+                'resourceId' => ID::unique(),
                 'activate' => true,
                 'repository' => $starterTemplate['body']['providerRepositoryId'],
                 'owner' => $starterTemplate['body']['providerOwner'],
@@ -728,18 +728,13 @@ class FunctionsCustomServerTest extends Scope
             ],
         ]);
 
-        $this->assertEquals($deployments['headers']['status-code'], 200);
+        $this->assertEquals(200, $deployments['headers']['status-code']);
         $this->assertCount(2, $deployments['body']['deployments']);
 
-        $deployments = $this->listDeployments($functionId, [
-            'search' => 'php-8.0'
-        ]);
+        $deployments = $this->listDeployments($functionId);
 
-        $this->assertEquals($deployments['headers']['status-code'], 200);
-        $this->assertEquals(3, $deployments['body']['total']);
         $this->assertIsArray($deployments['body']['deployments']);
-        $this->assertCount(3, $deployments['body']['deployments']);
-        $this->assertEquals($deployments['body']['deployments'][0]['$id'], $data['deploymentId']);
+        $this->assertEquals(200, $deployments['headers']['status-code']);
 
         $deployments = $this->listDeployments(
             $functionId,
diff --git a/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php b/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
index c66a581b1a..aea1971be7 100644
--- a/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
+++ b/tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
@@ -4454,13 +4454,12 @@ class ProjectsConsoleClientTest extends Scope
         $response = $this->client->call(Client::METHOD_GET, '/projects/' . $projectId . '/dev-keys', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
-        ], $this->getHeaders()), [
-            'search' => 'Dev'
-        ]);
+        ], $this->getHeaders()));
 
         $this->assertEquals(200, $response['headers']['status-code']);
-        $this->assertEquals(1, $response['body']['total']);
-        $this->assertEquals('Dev Key Test', $response['body']['devKeys'][0]['name']);
+        $this->assertEquals(2, $response['body']['total']);
+        $this->assertEquals('Key Test', $response['body']['devKeys'][0]['name']);
+        $this->assertEquals('Dev Key Test', $response['body']['devKeys'][1]['name']);
 
         /** List dev keys with querying `expire` */
         $response = $this->client->call(Client::METHOD_GET, '/projects/' . $projectId . '/dev-keys', array_merge([
diff --git a/tests/e2e/Services/Sites/SitesCustomServerTest.php b/tests/e2e/Services/Sites/SitesCustomServerTest.php
index 3a5308f767..f9d5b4acdf 100644
--- a/tests/e2e/Services/Sites/SitesCustomServerTest.php
+++ b/tests/e2e/Services/Sites/SitesCustomServerTest.php
@@ -638,9 +638,7 @@ class SitesCustomServerTest extends Scope
             'siteId' => ID::unique()
         ]);
 
-        $sites = $this->listSites([
-            'search' => $siteId,
-        ]);
+        $sites = $this->listSites();
 
         $this->assertEquals($sites['headers']['status-code'], 200);
         $this->assertCount(1, $sites['body']['sites']);