diff --git a/app/config/collections.php b/app/config/collections.php
index b445b9ecd8..4697416cc9 100644
--- a/app/config/collections.php
+++ b/app/config/collections.php
@@ -3548,7 +3548,7 @@ $collections = [
             ],
         ],
     ],
-    'slowQueries' => [
+    'slow_queries' => [
         '$collection' => Database::METADATA,
         '$id' => 'slow_queries',
         'name' => 'slow_queries',
@@ -3624,7 +3624,7 @@ $collections = [
             [
                 '$id' => '_key_database_id',
                 'type' => Database::INDEX_KEY,
-                'attributes' => ['databaseId', 'blocked', 'collectionId'],
+                'attributes' => ['blocked'],
                 'lengths' => [Database::LENGTH_KEY],
                 'orders' => []
             ],
@@ -3632,7 +3632,7 @@ $collections = [
                 '$id' => '_key_blocked',
                 'type' => Database::INDEX_KEY,
                 'attributes' => ['blocked', 'databaseId', 'collectionId'],
-                'lengths' => [Database::LENGTH_KEY],
+                'lengths' => [],
                 'orders' => []
             ]
         ],
diff --git a/app/controllers/api/databases.php b/app/controllers/api/databases.php
index 207f841c74..6dc91522c5 100644
--- a/app/controllers/api/databases.php
+++ b/app/controllers/api/databases.php
@@ -2896,7 +2896,7 @@ App::get('/v1/databases/:databaseId/slow-queries')
         $cursor = reset($cursor);
         if ($cursor) {
             $documentId = $cursor->getValue();
-            $cursorDocument = Authorization::skip(fn()=>$dbForProject->getDocument('slowQueries', $documentId));
+            $cursorDocument = Authorization::skip(fn()=>$dbForProject->getDocument('slow_queries', $documentId));
             if ($cursorDocument->isEmpty()) {
                 throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "Slow query '{$documentId}' for the 'cursor' value not found.");
             }
@@ -2904,12 +2904,11 @@ App::get('/v1/databases/:databaseId/slow-queries')
         }
 
         $response->dynamic(new Document([
-            'documents' => Authorization::skip(fn()=>$dbForProject->find('slowQueries', $queries)),
-            'total' => Authorization::skip(fn()=>$dbForProject->count('slowQueries', Query::groupByType($queries)['filters'], APP_LIMIT_COUNT)),
+            'documents' => Authorization::skip(fn()=>$dbForProject->find('slow_queries', $queries)),
+            'total' => Authorization::skip(fn()=>$dbForProject->count('slow_queries', Query::groupByType($queries)['filters'], APP_LIMIT_COUNT)),
         ]), Response::MODEL_DOCUMENT_LIST);
     });
 
-
 App::get('/v1/databases/slow-queries/:documentId')
     ->desc('Get Slow Query Document')
     ->groups(['api', 'database'])
@@ -2931,13 +2930,14 @@ App::get('/v1/databases/slow-queries/:documentId')
     ->inject('mode')
     ->inject('project')
     ->action(function (string $documentId, Response $response, Database $dbForProject) {
-        $document = Authorization::skip(fn () => $dbForProject->getDocument('slowQueries', $documentId));
+        $document = Authorization::skip(fn () => $dbForProject->getDocument('slow_queries', $documentId));
         if ($document->isEmpty()) {
             throw new Exception(Exception::DOCUMENT_NOT_FOUND);
         }
 
         $response->dynamic($document, Response::MODEL_DOCUMENT);
     });
+
 App::delete('/v1/databases/slow-queries/:documentId')
     ->desc('Delete Slow query Document')
     ->desc('List  Documents')
@@ -2949,7 +2949,7 @@ App::delete('/v1/databases/slow-queries/:documentId')
     //->label('usage.params', ['databaseId:{request.databaseId}', 'collectionId:{request.collectionId}'])
     ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
     ->label('sdk.namespace', 'databases')
-    ->label('event', 'slowQueries.documents.[documentId].delete')
+    ->label('event', 'slow_queries.documents.[documentId].delete')
     ->label('audits.event', 'document.delete')
     ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}/document/{request.documentId}')
     ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
@@ -2960,21 +2960,21 @@ App::delete('/v1/databases/slow-queries/:documentId')
     ->inject('events')
     ->inject('deletes')
     ->action(function (string $documentId, Response $response, Database $dbForProject, Event $events, Delete $deletes) {
-        $document = Authorization::skip(fn() => $dbForProject->getDocument('slowQueries', $documentId));
+        $document = Authorization::skip(fn() => $dbForProject->getDocument('slow_queries', $documentId));
         if ($document->isEmpty()) {
             throw new Exception(Exception::DOCUMENT_NOT_FOUND);
         }
 
-        Authorization::skip(fn() => $dbForProject->deleteDocument('slowQueries', $documentId));
+        Authorization::skip(fn() => $dbForProject->deleteDocument('slow_queries', $documentId));
 
-        $dbForProject->deleteCachedDocument('slowQueries', $documentId);
+        $dbForProject->deleteCachedDocument('slow_queries', $documentId);
 
         $deletes
             ->setType(DELETE_TYPE_AUDIT)
             ->setDocument($document)
         ;
 
-        // todo: check events
+        // todo: check slow Queries events
 
         $events
             ->setParam('collectionId', 'slowQueries')
@@ -2983,4 +2983,4 @@ App::delete('/v1/databases/slow-queries/:documentId')
         ;
 
         $response->noContent();
-    });
+    });
\ No newline at end of file