diff --git a/engine/src/main/java/com/arcadedb/GlobalConfiguration.java b/engine/src/main/java/com/arcadedb/GlobalConfiguration.java
index b83606733..d5c3d3d02 100644
--- a/engine/src/main/java/com/arcadedb/GlobalConfiguration.java
+++ b/engine/src/main/java/com/arcadedb/GlobalConfiguration.java
@@ -200,7 +200,7 @@ public Object call(final Object value) {
       50),
 
   TYPE_DEFAULT_BUCKETS("arcadedb.typeDefaultBuckets", SCOPE.DATABASE, "Default number of buckets to create per type", Integer.class,
-      8),
+      1),
 
   BUCKET_DEFAULT_PAGE_SIZE("arcadedb.bucketDefaultPageSize", SCOPE.DATABASE,
       "Default page size in bytes for buckets. Default is 64KB", Integer.class, 65_536),
diff --git a/engine/src/main/java/com/arcadedb/query/sql/executor/SelectExecutionPlanner.java b/engine/src/main/java/com/arcadedb/query/sql/executor/SelectExecutionPlanner.java
index e8f78f85b..a2532f451 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/executor/SelectExecutionPlanner.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/executor/SelectExecutionPlanner.java
@@ -897,8 +897,7 @@ else if (o instanceof Result && ((Result) o).isElement())
       }
       info.fetchExecutionPlan.chain(new ParallelExecStep(plans, context));
     } else if (target.getIndex() != null) {
-      if (info.buckets.size() > 1)
-        handleIndexAsTarget(info.fetchExecutionPlan, info, target.getIndex(), null, context);
+      handleIndexAsTarget(info.fetchExecutionPlan, info, target.getIndex(), null, context);
     } else if (target.getSchema() != null) {
       handleSchemaAsTarget(info.fetchExecutionPlan, target.getSchema(), context);
     } else if (target.getRids() != null && !target.getRids().isEmpty()) {
@@ -1697,7 +1696,7 @@ private List<ExecutionStepInternal> handleTypeAsTargetWithIndex(
 
     final List<IndexSearchDescriptor> indexSearchDescriptors =
         info.flattenedWhereClause.stream()
-        .map(x -> findBestIndexFor(context, indexes, x, typez))
+            .map(x -> findBestIndexFor(context, indexes, x, typez))
             .filter(Objects::nonNull)
             .collect(Collectors.toList());
 
@@ -1705,9 +1704,9 @@ private List<ExecutionStepInternal> handleTypeAsTargetWithIndex(
       return null;
 
     // TODO
-        if (indexSearchDescriptors.size() != info.flattenedWhereClause.size()) {
-          return null; //some blocks could not be managed with an index
-        }
+    if (indexSearchDescriptors.size() != info.flattenedWhereClause.size()) {
+      return null; //some blocks could not be managed with an index
+    }
 
 //    // ARCADEDB: NOT APPLICABLE TO ORIENTDB
 //    // IF THERE ARE ANY CHANGES IN TX, AVOID IT
diff --git a/engine/src/test/java/com/arcadedb/ACIDTransactionTest.java b/engine/src/test/java/com/arcadedb/ACIDTransactionTest.java
index 5cf852376..bac3247e3 100644
--- a/engine/src/test/java/com/arcadedb/ACIDTransactionTest.java
+++ b/engine/src/test/java/com/arcadedb/ACIDTransactionTest.java
@@ -317,7 +317,7 @@ public void testAsyncIOExceptionAfterWALIsWrittenManyRecords() {
   @Test
   public void multiThreadConcurrentTransactions() {
     database.transaction(() -> {
-      final DocumentType type = database.getSchema().createDocumentType("Stock");
+      final DocumentType type = database.getSchema().createDocumentType("Stock", 8);
       type.createProperty("symbol", Type.STRING);
       type.createProperty("date", Type.DATETIME);
       type.createProperty("history", Type.LIST);
diff --git a/engine/src/test/java/com/arcadedb/TransactionIsolationTest.java b/engine/src/test/java/com/arcadedb/TransactionIsolationTest.java
index 56e02aea1..7a9fa446c 100644
--- a/engine/src/test/java/com/arcadedb/TransactionIsolationTest.java
+++ b/engine/src/test/java/com/arcadedb/TransactionIsolationTest.java
@@ -16,7 +16,7 @@ protected void beginTest() {
     database.transaction(() -> {
       if (database.getSchema().existsType("Node"))
         database.getSchema().dropType("Node");
-      database.getSchema().createVertexType("Node");
+      database.getSchema().createVertexType("Node", 8);
     });
   }
 
diff --git a/engine/src/test/java/com/arcadedb/query/sql/executor/ScriptExecutionTest.java b/engine/src/test/java/com/arcadedb/query/sql/executor/ScriptExecutionTest.java
index 0b2e65f6c..17e9a7c51 100644
--- a/engine/src/test/java/com/arcadedb/query/sql/executor/ScriptExecutionTest.java
+++ b/engine/src/test/java/com/arcadedb/query/sql/executor/ScriptExecutionTest.java
@@ -201,7 +201,7 @@ public void testCommitRetry() {
   @Test
   public void testCommitRetryMultiThreadsSQLIncrement() throws IOException {
     String className = "testCommitRetryMTSQLIncrement";
-    database.getSchema().createDocumentType(className);
+    database.getSchema().createDocumentType(className, 8);
 
     // AVOID RETRY, EXPECTING TO MISS SOME UPDATES
     database.transaction(() -> {
@@ -258,7 +258,7 @@ public void testCommitRetryMultiThreadsSQLIncrement() throws IOException {
   @Test
   public void testCommitRetryMultiThreadsSQLIncrementRepeatableRead() throws IOException {
     String className = "testCommitRetryMTSQLIncrement";
-    database.getSchema().createDocumentType(className);
+    database.getSchema().createDocumentType(className, 8);
 
     // AVOID RETRY, EXPECTING TO MISS SOME UPDATES
     database.transaction(() -> {
diff --git a/engine/src/test/java/com/arcadedb/query/sql/executor/SelectStatementExecutionTest.java b/engine/src/test/java/com/arcadedb/query/sql/executor/SelectStatementExecutionTest.java
index d3a8665dc..febfc6f31 100644
--- a/engine/src/test/java/com/arcadedb/query/sql/executor/SelectStatementExecutionTest.java
+++ b/engine/src/test/java/com/arcadedb/query/sql/executor/SelectStatementExecutionTest.java
@@ -1070,7 +1070,7 @@ public void testFetchFromSingleRidParam() {
 
   @Test
   public void testFetchFromSingleRid3() {
-    database.getSchema().createDocumentType("testFetchFromSingleRid3");
+    database.getSchema().createDocumentType("testFetchFromSingleRid3", 8);
     database.begin();
     MutableDocument doc = database.newDocument("testFetchFromSingleRid3");
     doc.save();
@@ -1089,7 +1089,7 @@ public void testFetchFromSingleRid3() {
 
   @Test
   public void testFetchFromSingleRid4() {
-    database.getSchema().createDocumentType("testFetchFromSingleRid4");
+    database.getSchema().createDocumentType("testFetchFromSingleRid4", 8);
     database.begin();
     MutableDocument doc = database.newDocument("testFetchFromSingleRid4");
     doc.save();