Disable sled logging

Use an LRU only with 1000 entries
Increase the ARCache to 500 entries
2025-11-30 17:55:36 +00:00 · 2024-07-22 14:38:33 +02:00 · 2024-07-22 13:39:20 +02:00 · 2024-07-21 23:08:11 +02:00 · 2024-07-21 22:32:14 +02:00 · 2024-07-21 18:56:50 +02:00
222 changed files with 7226 additions and 22806 deletions
--- a/.github/workflows/bench-manual.yml
+++ b/.github/workflows/bench-manual.yml
@@ -18,7 +18,7 @@ jobs:
        timeout-minutes: 180 # 3h
        steps:
            - uses: actions/checkout@v3
-            - uses: dtolnay/rust-toolchain@1.79
+            - uses: helix-editor/rust-toolchain@v1
              with:
                profile: minimal

--- a/.github/workflows/bench-pr.yml
+++ b/.github/workflows/bench-pr.yml
@@ -16,37 +16,6 @@ jobs:
      runs-on: benchmarks
      timeout-minutes: 180 # 3h
      steps:
-        - name: Check permissions
-          id: permission
-          env:
-            PR_AUTHOR: ${{github.event.issue.user.login }}
-            COMMENT_AUTHOR: ${{github.event.comment.user.login }}
-            REPOSITORY: ${{github.repository}}
-            PR_ID: ${{github.event.issue.number}}
-          run: |
-            PR_REPOSITORY=$(gh api /repos/"$REPOSITORY"/pulls/"$PR_ID" --jq .head.repo.full_name)
-            if $(gh api /repos/"$REPOSITORY"/collaborators/"$PR_AUTHOR"/permission --jq .user.permissions.push)
-            then
-              echo "::notice title=Authentication success::PR author authenticated"
-            else
-              echo "::error title=Authentication error::PR author doesn't have push permission on this repository"
-              exit 1
-            fi
-            if $(gh api /repos/"$REPOSITORY"/collaborators/"$COMMENT_AUTHOR"/permission --jq .user.permissions.push)
-            then
-              echo "::notice title=Authentication success::Comment author authenticated"
-            else
-              echo "::error title=Authentication error::Comment author doesn't have push permission on this repository"
-              exit 1
-            fi
-            if [ "$PR_REPOSITORY" = "$REPOSITORY" ]
-            then
-              echo "::notice title=Authentication success::PR started from main repository"
-            else
-              echo "::error title=Authentication error::PR started from a fork"
-              exit 1
-            fi
-
        - name: Check for Command
          id: command
          uses: xt0rted/slash-command-action@v2
@@ -66,7 +35,7 @@ jobs:
            fetch-depth: 0 # fetch full history to be able to get main commit sha
            ref: ${{ steps.comment-branch.outputs.head_ref }}

-        - uses: dtolnay/rust-toolchain@1.79
+        - uses: helix-editor/rust-toolchain@v1
          with:
            profile: minimal

--- a/.github/workflows/bench-push-indexing.yml
+++ b/.github/workflows/bench-push-indexing.yml
@@ -12,7 +12,7 @@ jobs:
        timeout-minutes: 180 # 3h
        steps:
          - uses: actions/checkout@v3
-          - uses: dtolnay/rust-toolchain@1.79
+          - uses: helix-editor/rust-toolchain@v1
            with:
              profile: minimal

--- a/.github/workflows/benchmarks-manual.yml
+++ b/.github/workflows/benchmarks-manual.yml
@@ -18,7 +18,7 @@ jobs:
    timeout-minutes: 4320 # 72h
    steps:
      - uses: actions/checkout@v3
-      - uses: dtolnay/rust-toolchain@1.79
+      - uses: helix-editor/rust-toolchain@v1
        with:
          profile: minimal

--- a/.github/workflows/benchmarks-pr.yml
+++ b/.github/workflows/benchmarks-pr.yml
@@ -13,38 +13,7 @@ jobs:
    runs-on: benchmarks
    timeout-minutes: 4320 # 72h
    steps:
-      - name: Check permissions
-        id: permission
-        env:
-          PR_AUTHOR: ${{github.event.issue.user.login }}
-          COMMENT_AUTHOR: ${{github.event.comment.user.login }}
-          REPOSITORY: ${{github.repository}}
-          PR_ID: ${{github.event.issue.number}}
-        run: |
-          PR_REPOSITORY=$(gh api /repos/"$REPOSITORY"/pulls/"$PR_ID" --jq .head.repo.full_name)
-          if $(gh api /repos/"$REPOSITORY"/collaborators/"$PR_AUTHOR"/permission --jq .user.permissions.push)
-          then
-            echo "::notice title=Authentication success::PR author authenticated"
-          else
-            echo "::error title=Authentication error::PR author doesn't have push permission on this repository"
-            exit 1
-          fi
-          if $(gh api /repos/"$REPOSITORY"/collaborators/"$COMMENT_AUTHOR"/permission --jq .user.permissions.push)
-          then
-            echo "::notice title=Authentication success::Comment author authenticated"
-          else
-            echo "::error title=Authentication error::Comment author doesn't have push permission on this repository"
-            exit 1
-          fi
-          if [ "$PR_REPOSITORY" = "$REPOSITORY" ]
-          then
-            echo "::notice title=Authentication success::PR started from main repository"
-          else
-            echo "::error title=Authentication error::PR started from a fork"
-            exit 1
-          fi
-
-      - uses: dtolnay/rust-toolchain@1.79
+      - uses: helix-editor/rust-toolchain@v1
        with:
          profile: minimal

--- a/.github/workflows/benchmarks-push-indexing.yml
+++ b/.github/workflows/benchmarks-push-indexing.yml
@@ -16,7 +16,7 @@ jobs:
    timeout-minutes: 4320 # 72h
    steps:
      - uses: actions/checkout@v3
-      - uses: dtolnay/rust-toolchain@1.79
+      - uses: helix-editor/rust-toolchain@v1
        with:
          profile: minimal

--- a/.github/workflows/benchmarks-push-search-geo.yml
+++ b/.github/workflows/benchmarks-push-search-geo.yml
@@ -15,7 +15,7 @@ jobs:
    runs-on: benchmarks
    steps:
      - uses: actions/checkout@v3
-      - uses: dtolnay/rust-toolchain@1.79
+      - uses: helix-editor/rust-toolchain@v1
        with:
          profile: minimal

--- a/.github/workflows/benchmarks-push-search-songs.yml
+++ b/.github/workflows/benchmarks-push-search-songs.yml
@@ -15,7 +15,7 @@ jobs:
    runs-on: benchmarks
    steps:
      - uses: actions/checkout@v3
-      - uses: dtolnay/rust-toolchain@1.79
+      - uses: helix-editor/rust-toolchain@v1
        with:
          profile: minimal

--- a/.github/workflows/benchmarks-push-search-wiki.yml
+++ b/.github/workflows/benchmarks-push-search-wiki.yml
@@ -15,7 +15,7 @@ jobs:
    runs-on: benchmarks
    steps:
      - uses: actions/checkout@v3
-      - uses: dtolnay/rust-toolchain@1.79
+      - uses: helix-editor/rust-toolchain@v1
        with:
          profile: minimal

--- a/.github/workflows/flaky-tests.yml
+++ b/.github/workflows/flaky-tests.yml
@@ -17,7 +17,7 @@ jobs:
      run: |
        apt-get update && apt-get install -y curl
        apt-get install build-essential -y
-    - uses: dtolnay/rust-toolchain@1.79
+    - uses: helix-editor/rust-toolchain@v1
    - name: Install cargo-flaky
      run: cargo install cargo-flaky
    - name: Run cargo flaky in the dumps
--- a/.github/workflows/fuzzer-indexing.yml
+++ b/.github/workflows/fuzzer-indexing.yml
@@ -12,7 +12,7 @@ jobs:
    timeout-minutes: 4320 # 72h
    steps:
      - uses: actions/checkout@v3
-      - uses: dtolnay/rust-toolchain@1.79
+      - uses: helix-editor/rust-toolchain@v1
        with:
          profile: minimal

--- a/.github/workflows/publish-apt-brew-pkg.yml
+++ b/.github/workflows/publish-apt-brew-pkg.yml
@@ -25,7 +25,7 @@ jobs:
      run: |
        apt-get update && apt-get install -y curl
        apt-get install build-essential -y
-    - uses: dtolnay/rust-toolchain@1.79
+    - uses: helix-editor/rust-toolchain@v1
    - name: Install cargo-deb
      run: cargo install cargo-deb
    - uses: actions/checkout@v3
--- a/.github/workflows/publish-binaries.yml
+++ b/.github/workflows/publish-binaries.yml
@@ -45,7 +45,7 @@ jobs:
      run: |
        apt-get update && apt-get install -y curl
        apt-get install build-essential -y
-    - uses: dtolnay/rust-toolchain@1.79
+    - uses: helix-editor/rust-toolchain@v1
    - name: Build
      run: cargo build --release --locked
    # No need to upload binaries for dry run (cron)
@@ -75,7 +75,7 @@ jobs:
            asset_name: meilisearch-windows-amd64.exe
    steps:
    - uses: actions/checkout@v3
-    - uses: dtolnay/rust-toolchain@1.79
+    - uses: helix-editor/rust-toolchain@v1
    - name: Build
      run: cargo build --release --locked
    # No need to upload binaries for dry run (cron)
@@ -101,7 +101,7 @@ jobs:
      - name: Checkout repository
        uses: actions/checkout@v3
      - name: Installing Rust toolchain
-        uses: dtolnay/rust-toolchain@1.79
+        uses: helix-editor/rust-toolchain@v1
        with:
          profile: minimal
          target: ${{ matrix.target }}
@@ -148,7 +148,7 @@ jobs:
          add-apt-repository "deb [arch=$(dpkg --print-architecture)] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
          apt-get update -y && apt-get install -y docker-ce
      - name: Installing Rust toolchain
-        uses: dtolnay/rust-toolchain@1.79
+        uses: helix-editor/rust-toolchain@v1
        with:
          profile: minimal
          target: ${{ matrix.target }}
--- a/.github/workflows/test-suite.yml
+++ b/.github/workflows/test-suite.yml
@@ -31,7 +31,7 @@ jobs:
          apt-get update && apt-get install -y curl
          apt-get install build-essential -y
      - name: Setup test with Rust stable
-        uses: dtolnay/rust-toolchain@1.79
+        uses: helix-editor/rust-toolchain@v1
      - name: Cache dependencies
        uses: Swatinem/rust-cache@v2.7.1
      - name: Run cargo check without any default features
@@ -56,7 +56,7 @@ jobs:
      - uses: actions/checkout@v3
      - name: Cache dependencies
        uses: Swatinem/rust-cache@v2.7.1
-      - uses: dtolnay/rust-toolchain@1.79
+      - uses: helix-editor/rust-toolchain@v1
      - name: Run cargo check without any default features
        uses: actions-rs/cargo@v1
        with:
@@ -81,7 +81,7 @@ jobs:
        run: |
          apt-get update
          apt-get install --assume-yes build-essential curl
-      - uses: dtolnay/rust-toolchain@1.79
+      - uses: helix-editor/rust-toolchain@v1
      - name: Run cargo build with almost all features
        run: |
          cargo build --workspace --locked --release --features "$(cargo xtask list-features --exclude-feature cuda)"
@@ -101,7 +101,7 @@ jobs:
        run: |
          apt-get update
          apt-get install --assume-yes build-essential curl
-      - uses: dtolnay/rust-toolchain@1.79
+      - uses: helix-editor/rust-toolchain@v1
      - name: Run cargo tree without default features and check lindera is not present
        run: |
          if cargo tree -f '{p} {f}' -e normal --no-default-features | grep -qz lindera; then
@@ -125,7 +125,7 @@ jobs:
        run: |
          apt-get update && apt-get install -y curl
          apt-get install build-essential -y
-      - uses: dtolnay/rust-toolchain@1.79
+      - uses: helix-editor/rust-toolchain@v1
      - name: Cache dependencies
        uses: Swatinem/rust-cache@v2.7.1
      - name: Run tests in debug
@@ -139,7 +139,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v3
-      - uses: dtolnay/rust-toolchain@1.79
+      - uses: helix-editor/rust-toolchain@v1
        with:
          profile: minimal
          components: clippy
@@ -156,7 +156,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v3
-      - uses: dtolnay/rust-toolchain@1.79
+      - uses: helix-editor/rust-toolchain@v1
        with:
          profile: minimal
          toolchain: nightly-2024-07-09
--- a/.github/workflows/update-cargo-toml-version.yml
+++ b/.github/workflows/update-cargo-toml-version.yml
@@ -18,7 +18,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v3
-      - uses: dtolnay/rust-toolchain@1.79
+      - uses: helix-editor/rust-toolchain@v1
        with:
          profile: minimal
      - name: Install sd
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -55,7 +55,7 @@ dependencies = [
 "encoding_rs",
 "flate2",
 "futures-core",
- "h2 0.3.26",
+ "h2",
 "http 0.2.11",
 "httparse",
 "httpdate",
@@ -387,14 +387,14 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 [[package]]
 name = "arroy"
 version = "0.4.0"
-source = "git+https://github.com/meilisearch/arroy/?rev=2386594dfb009ce08821a925ccc89fb8e30bf73d#2386594dfb009ce08821a925ccc89fb8e30bf73d"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ece9e5347e7fdaaea3181dec7f916677ad5f3fcbac183648ce1924eb4aeef9a"
 dependencies = [
 "bytemuck",
 "byteorder",
 "heed",
 "log",
 "memmap2",
- "nohash",
 "ordered-float",
 "rand",
 "rayon",
@@ -403,16 +403,6 @@ dependencies = [
 "thiserror",
 ]

-[[package]]
-name = "assert-json-diff"
-version = "2.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12"
-dependencies = [
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "async-trait"
 version = "0.1.81"
@@ -424,12 +414,6 @@ dependencies = [
 "syn 2.0.60",
 ]

-[[package]]
-name = "atomic-waker"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
-
 [[package]]
 name = "autocfg"
 version = "1.2.0"
@@ -471,7 +455,7 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"

 [[package]]
 name = "benchmarks"
-version = "1.11.0"
+version = "1.9.0"
 dependencies = [
 "anyhow",
 "bytes",
@@ -652,7 +636,7 @@ dependencies = [

 [[package]]
 name = "build-info"
-version = "1.11.0"
+version = "1.9.0"
 dependencies = [
 "anyhow",
 "time",
@@ -933,16 +917,20 @@ dependencies = [

 [[package]]
 name = "charabia"
-version = "0.9.1"
-source = "git+https://github.com/meilisearch/charabia?branch=mutualize-char-normalizer#f8d8308cdb8db80819be7eeed5652cc4a995cc71"
+version = "0.8.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9868a22f10dee80498a8a2b6c641d80bf28ea4495fcf71c2dc4836c2dd23958c"
 dependencies = [
 "aho-corasick",
+ "cow-utils",
 "csv",
+ "deunicode",
 "either",
 "fst",
 "irg-kvariants",
 "jieba-rs",
 "lindera",
+ "litemap",
 "once_cell",
 "pinyin",
 "serde",
@@ -950,6 +938,7 @@ dependencies = [
 "unicode-normalization",
 "wana_kana",
 "whatlang",
+ "zerovec",
 ]

 [[package]]
@@ -1140,6 +1129,12 @@ version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"

+[[package]]
+name = "cow-utils"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79bb3adfaf5f75d24b01aee375f7555907840fa2800e5ec8fa3b9e2031830173"
+
 [[package]]
 name = "cpufeatures"
 version = "0.2.12"
@@ -1382,24 +1377,6 @@ dependencies = [
 "syn 2.0.60",
 ]

-[[package]]
-name = "deadpool"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb84100978c1c7b37f09ed3ce3e5f843af02c2a2c431bae5b19230dad2c1b490"
-dependencies = [
- "async-trait",
- "deadpool-runtime",
- "num_cpus",
- "tokio",
-]
-
-[[package]]
-name = "deadpool-runtime"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "092966b41edc516079bdf31ec78a2e0588d1d0c08f78b91d8307215928642b2b"
-
 [[package]]
 name = "debugid"
 version = "0.8.0"
@@ -1540,6 +1517,12 @@ dependencies = [
 "syn 2.0.60",
 ]

+[[package]]
+name = "deunicode"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "339544cc9e2c4dc3fc7149fd630c5f22263a4fdf18a98afd0075784968b5cf00"
+
 [[package]]
 name = "digest"
 version = "0.10.7"
@@ -1621,7 +1604,7 @@ dependencies = [

 [[package]]
 name = "dump"
-version = "1.11.0"
+version = "1.9.0"
 dependencies = [
 "anyhow",
 "big_s",
@@ -1833,7 +1816,7 @@ checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"

 [[package]]
 name = "file-store"
-version = "1.11.0"
+version = "1.9.0"
 dependencies = [
 "tempfile",
 "thiserror",
@@ -1855,7 +1838,7 @@ dependencies = [

 [[package]]
 name = "filter-parser"
-version = "1.11.0"
+version = "1.9.0"
 dependencies = [
 "insta",
 "nom",
@@ -1875,7 +1858,7 @@ dependencies = [

 [[package]]
 name = "flatten-serde-json"
-version = "1.11.0"
+version = "1.9.0"
 dependencies = [
 "criterion",
 "serde_json",
@@ -1999,7 +1982,7 @@ dependencies = [

 [[package]]
 name = "fuzzers"
-version = "1.11.0"
+version = "1.9.0"
 dependencies = [
 "arbitrary",
 "clap",
@@ -2220,11 +2203,11 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 [[package]]
 name = "grenad"
 version = "0.4.7"
-source = "git+https://github.com/meilisearch/grenad?branch=various-improvements#58ac87d852413571102f44c5e55ca13509a3f1a0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "350d89047298d3b1b40050acd11ab76e487b854a104b760ebc5a7f375093de77"
 dependencies = [
 "bytemuck",
 "byteorder",
- "either",
 "rayon",
 "tempfile",
 ]
@@ -2248,25 +2231,6 @@ dependencies = [
 "tracing",
 ]

-[[package]]
-name = "h2"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
-dependencies = [
- "atomic-waker",
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "http 1.1.0",
- "indexmap",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
 [[package]]
 name = "half"
 version = "1.8.2"
@@ -2307,9 +2271,9 @@ dependencies = [

 [[package]]
 name = "hashbrown"
-version = "0.14.5"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
 "ahash 0.8.11",
 "allocator-api2",
@@ -2477,11 +2441,9 @@ dependencies = [
 "bytes",
 "futures-channel",
 "futures-util",
- "h2 0.4.5",
 "http 1.1.0",
 "http-body",
 "httparse",
- "httpdate",
 "itoa",
 "pin-project-lite",
 "smallvec",
@@ -2551,7 +2513,7 @@ checksum = "206ca75c9c03ba3d4ace2460e57b189f39f43de612c2f85836e65c929701bb2d"

 [[package]]
 name = "index-scheduler"
-version = "1.11.0"
+version = "1.9.0"
 dependencies = [
 "anyhow",
 "arroy",
@@ -2569,7 +2531,6 @@ dependencies = [
 "meili-snap",
 "meilisearch-auth",
 "meilisearch-types",
- "memmap2",
 "page_size",
 "rayon",
 "roaring",
@@ -2591,7 +2552,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
 dependencies = [
 "equivalent",
- "hashbrown 0.14.5",
+ "hashbrown 0.14.3",
 "serde",
 ]

@@ -2650,7 +2611,8 @@ checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6"
 [[package]]
 name = "irg-kvariants"
 version = "0.1.1"
-source = "git+https://github.com/meilisearch/charabia?branch=mutualize-char-normalizer#f8d8308cdb8db80819be7eeed5652cc4a995cc71"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef2af7c331f2536964a32b78a7d2e0963d78b42f4a76323b16cc7d94b1ddce26"
 dependencies = [
 "csv",
 "once_cell",
@@ -2745,7 +2707,7 @@ dependencies = [

 [[package]]
 name = "json-depth-checker"
-version = "1.11.0"
+version = "1.9.0"
 dependencies = [
 "criterion",
 "serde_json",
@@ -3261,6 +3223,12 @@ dependencies = [
 "unicode-segmentation",
 ]

+[[package]]
+name = "litemap"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704"
+
 [[package]]
 name = "lmdb-master-sys"
 version = "0.2.2"
@@ -3312,6 +3280,15 @@ version = "0.4.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"

+[[package]]
+name = "lru"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc"
+dependencies = [
+ "hashbrown 0.14.3",
+]
+
 [[package]]
 name = "lzma-rs"
 version = "0.3.0"
@@ -3364,7 +3341,7 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771"

 [[package]]
 name = "meili-snap"
-version = "1.11.0"
+version = "1.9.0"
 dependencies = [
 "insta",
 "md5",
@@ -3373,7 +3350,7 @@ dependencies = [

 [[package]]
 name = "meilisearch"
-version = "1.11.0"
+version = "1.9.0"
 dependencies = [
 "actix-cors",
 "actix-http",
@@ -3455,14 +3432,13 @@ dependencies = [
 "url",
 "urlencoding",
 "uuid",
- "wiremock",
 "yaup",
 "zip 2.1.3",
 ]

 [[package]]
 name = "meilisearch-auth"
-version = "1.11.0"
+version = "1.9.0"
 dependencies = [
 "base64 0.22.1",
 "enum-iterator",
@@ -3481,7 +3457,7 @@ dependencies = [

 [[package]]
 name = "meilisearch-types"
-version = "1.11.0"
+version = "1.9.0"
 dependencies = [
 "actix-web",
 "anyhow",
@@ -3511,7 +3487,7 @@ dependencies = [

 [[package]]
 name = "meilitool"
-version = "1.11.0"
+version = "1.9.0"
 dependencies = [
 "anyhow",
 "clap",
@@ -3519,7 +3495,6 @@ dependencies = [
 "file-store",
 "meilisearch-auth",
 "meilisearch-types",
- "serde",
 "time",
 "uuid",
 ]
@@ -3542,7 +3517,7 @@ dependencies = [

 [[package]]
 name = "milli"
-version = "1.11.0"
+version = "1.9.0"
 dependencies = [
 "arroy",
 "big_s",
@@ -3566,7 +3541,6 @@ dependencies = [
 "fxhash",
 "geoutils",
 "grenad",
- "hashbrown 0.14.5",
 "heed",
 "hf-hub",
 "indexmap",
@@ -3575,6 +3549,7 @@ dependencies = [
 "json-depth-checker",
 "levenshtein_automata",
 "liquid",
+ "lru",
 "maplit",
 "md5",
 "meili-snap",
@@ -3686,12 +3661,6 @@ version = "0.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6d02c0b00610773bb7fc61d85e13d86c7858cbdf00e1a120bfc41bc055dbaa0e"

-[[package]]
-name = "nohash"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0f889fb66f7acdf83442c35775764b51fed3c606ab9cee51500dbde2cf528ca"
-
 [[package]]
 name = "nom"
 version = "7.1.3"
@@ -3836,8 +3805,9 @@ dependencies = [

 [[package]]
 name = "obkv"
-version = "0.3.0"
-source = "git+https://github.com/kerollmops/obkv?branch=unsized-kvreader#ce535874008ecac554f02e0c670e6caf62134d6b"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2e27bcfe835a379d32352112f6b8dbae2d99d16a5fff42abe6e5ba5386c1e5a"

 [[package]]
 name = "once_cell"
@@ -3982,7 +3952,7 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"

 [[package]]
 name = "permissive-json-pointer"
-version = "1.11.0"
+version = "1.9.0"
 dependencies = [
 "big_s",
 "serde_json",
@@ -4654,7 +4624,8 @@ dependencies = [
 [[package]]
 name = "roaring"
 version = "0.10.6"
-source = "git+https://github.com/RoaringBitmap/roaring-rs?branch=clone-iter-slice#6bba84b1a47da1d6e52d5c4dc0ce8593ae4646a5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f4b84ba6e838ceb47b41de5194a60244fac43d9fe03b71dbe8c5a201081d6d1"
 dependencies = [
 "bytemuck",
 "byteorder",
@@ -4839,9 +4810,9 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4"

 [[package]]
 name = "serde"
-version = "1.0.210"
+version = "1.0.204"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
+checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
 dependencies = [
 "serde_derive",
 ]
@@ -4857,9 +4828,9 @@ dependencies = [

 [[package]]
 name = "serde_derive"
-version = "1.0.210"
+version = "1.0.204"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
+checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -6040,7 +6011,7 @@ version = "0.16.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "471d1c1645d361eb782a1650b1786a8fb58dd625e681a04c09f5ff7c8764a7b0"
 dependencies = [
- "hashbrown 0.14.5",
+ "hashbrown 0.14.3",
 "once_cell",
 ]

@@ -6320,30 +6291,6 @@ dependencies = [
 "windows-sys 0.48.0",
 ]

-[[package]]
-name = "wiremock"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec874e1eef0df2dcac546057fe5e29186f09c378181cd7b635b4b7bcc98e9d81"
-dependencies = [
- "assert-json-diff",
- "async-trait",
- "base64 0.21.7",
- "deadpool",
- "futures",
- "http 1.1.0",
- "http-body-util",
- "hyper",
- "hyper-util",
- "log",
- "once_cell",
- "regex",
- "serde",
- "serde_json",
- "tokio",
- "url",
-]
-
 [[package]]
 name = "wyz"
 version = "0.5.1"
@@ -6366,7 +6313,7 @@ dependencies = [

 [[package]]
 name = "xtask"
-version = "1.11.0"
+version = "1.9.0"
 dependencies = [
 "anyhow",
 "build-info",
@@ -6489,6 +6436,15 @@ dependencies = [
 "syn 2.0.60",
 ]

+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "zerofrom",
+]
+
 [[package]]
 name = "zip"
 version = "1.1.4"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,7 +22,7 @@ members = [
 ]

 [workspace.package]
-version = "1.11.0"
+version = "1.9.0"
 authors = [
    "Quentin de Quelen <quentin@dequelen.me>",
    "Clément Renault <clement@meilisearch.com>",
@@ -44,5 +44,23 @@ opt-level = 3
 [profile.dev.package.roaring]
 opt-level = 3

-[patch.crates-io]
-roaring = { git = "https://github.com/RoaringBitmap/roaring-rs", branch = "clone-iter-slice" }
+[profile.dev.package.lindera-ipadic-builder]
+opt-level = 3
+[profile.dev.package.encoding]
+opt-level = 3
+[profile.dev.package.yada]
+opt-level = 3
+
+[profile.release.package.lindera-ipadic-builder]
+opt-level = 3
+[profile.release.package.encoding]
+opt-level = 3
+[profile.release.package.yada]
+opt-level = 3
+
+[profile.bench.package.lindera-ipadic-builder]
+opt-level = 3
+[profile.bench.package.encoding]
+opt-level = 3
+[profile.bench.package.yada]
+opt-level = 3
--- a/README.md
+++ b/README.md
@@ -45,14 +45,14 @@ See the list of all our example apps in our [demos repository](https://github.co
 ## ✨ Features
 - **Hybrid search:** Combine the best of both [semantic](https://www.meilisearch.com/docs/learn/experimental/vector_search?utm_campaign=oss&utm_source=github&utm_medium=meilisearch&utm_content=features) & full-text search to get the most relevant results
 - **Search-as-you-type:** Find & display results in less than 50 milliseconds to provide an intuitive experience
- **[Typo tolerance](https://www.meilisearch.com/docs/learn/relevancy/typo_tolerance_settings?utm_campaign=oss&utm_source=github&utm_medium=meilisearch&utm_content=features):** get relevant matches even when queries contain typos and misspellings
+- **[Typo tolerance](https://www.meilisearch.com/docs/learn/configuration/typo_tolerance?utm_campaign=oss&utm_source=github&utm_medium=meilisearch&utm_content=features):** get relevant matches even when queries contain typos and misspellings
 - **[Filtering](https://www.meilisearch.com/docs/learn/fine_tuning_results/filtering?utm_campaign=oss&utm_source=github&utm_medium=meilisearch&utm_content=features) and [faceted search](https://www.meilisearch.com/docs/learn/fine_tuning_results/faceted_search?utm_campaign=oss&utm_source=github&utm_medium=meilisearch&utm_content=features):** enhance your users' search experience with custom filters and build a faceted search interface in a few lines of code
 - **[Sorting](https://www.meilisearch.com/docs/learn/fine_tuning_results/sorting?utm_campaign=oss&utm_source=github&utm_medium=meilisearch&utm_content=features):** sort results based on price, date, or pretty much anything else your users need
- **[Synonym support](https://www.meilisearch.com/docs/learn/relevancy/synonyms?utm_campaign=oss&utm_source=github&utm_medium=meilisearch&utm_content=features):** configure synonyms to include more relevant content in your search results
+- **[Synonym support](https://www.meilisearch.com/docs/learn/configuration/synonyms?utm_campaign=oss&utm_source=github&utm_medium=meilisearch&utm_content=features):** configure synonyms to include more relevant content in your search results
 - **[Geosearch](https://www.meilisearch.com/docs/learn/fine_tuning_results/geosearch?utm_campaign=oss&utm_source=github&utm_medium=meilisearch&utm_content=features):** filter and sort documents based on geographic data
 - **[Extensive language support](https://www.meilisearch.com/docs/learn/what_is_meilisearch/language?utm_campaign=oss&utm_source=github&utm_medium=meilisearch&utm_content=features):** search datasets in any language, with optimized support for Chinese, Japanese, Hebrew, and languages using the Latin alphabet
 - **[Security management](https://www.meilisearch.com/docs/learn/security/master_api_keys?utm_campaign=oss&utm_source=github&utm_medium=meilisearch&utm_content=features):** control which users can access what data with API keys that allow fine-grained permissions handling
- **[Multi-Tenancy](https://www.meilisearch.com/docs/learn/security/multitenancy_tenant_tokens?utm_campaign=oss&utm_source=github&utm_medium=meilisearch&utm_content=features):** personalize search results for any number of application tenants
+- **[Multi-Tenancy](https://www.meilisearch.com/docs/learn/security/tenant_tokens?utm_campaign=oss&utm_source=github&utm_medium=meilisearch&utm_content=features):** personalize search results for any number of application tenants
 - **Highly Customizable:** customize Meilisearch to your specific needs or use our out-of-the-box and hassle-free presets
 - **[RESTful API](https://www.meilisearch.com/docs/reference/api/overview?utm_campaign=oss&utm_source=github&utm_medium=meilisearch&utm_content=features):** integrate Meilisearch in your technical stack with our plugins and SDKs
 - **Easy to install, deploy, and maintain**
--- a/dump/src/lib.rs
+++ b/dump/src/lib.rs
@@ -286,7 +286,6 @@ pub(crate) mod test {
            pagination: Setting::NotSet,
            embedders: Setting::NotSet,
            search_cutoff_ms: Setting::NotSet,
-            localized_attributes: Setting::NotSet,
            _kind: std::marker::PhantomData,
        };
        settings.check()
--- a/dump/src/reader/compat/v5_to_v6.rs
+++ b/dump/src/reader/compat/v5_to_v6.rs
@@ -379,7 +379,6 @@ impl<T> From<v5::Settings<T>> for v6::Settings<v6::Unchecked> {
                v5::Setting::NotSet => v6::Setting::NotSet,
            },
            embedders: v6::Setting::NotSet,
-            localized_attributes: v6::Setting::NotSet,
            search_cutoff_ms: v6::Setting::NotSet,
            _kind: std::marker::PhantomData,
        }
--- a/dump/src/reader/mod.rs
+++ b/dump/src/reader/mod.rs
@@ -255,8 +255,6 @@ pub(crate) mod test {
        }
        "###);

-        insta::assert_json_snapshot!(vector_index.settings().unwrap());
-
        {
            let documents: Result<Vec<_>> = vector_index.documents().unwrap().collect();
            let mut documents = documents.unwrap();
--- a/dump/src/reader/snapshots/dumpreadertest__import_dump_v6_with_vectors-5.snap
+++ b/dump/src/reader/snapshots/dumpreadertest__import_dump_v6_with_vectors-5.snap
@@ -1,56 +1,783 @@
 ---
 source: dump/src/reader/mod.rs
-expression: vector_index.settings().unwrap()
+expression: document
 ---
 {
-  "displayedAttributes": [
-    "*"
-  ],
-  "searchableAttributes": [
-    "*"
-  ],
-  "filterableAttributes": [],
-  "sortableAttributes": [],
-  "rankingRules": [
-    "words",
-    "typo",
-    "proximity",
-    "attribute",
-    "sort",
-    "exactness"
-  ],
-  "stopWords": [],
-  "nonSeparatorTokens": [],
-  "separatorTokens": [],
-  "dictionary": [],
-  "synonyms": {},
-  "distinctAttribute": null,
-  "proximityPrecision": "byWord",
-  "typoTolerance": {
-    "enabled": true,
-    "minWordSizeForTypos": {
-      "oneTypo": 5,
-      "twoTypos": 9
-    },
-    "disableOnWords": [],
-    "disableOnAttributes": []
-  },
-  "faceting": {
-    "maxValuesPerFacet": 100,
-    "sortFacetValuesBy": {
-      "*": "alpha"
-    }
-  },
-  "pagination": {
-    "maxTotalHits": 1000
-  },
-  "embedders": {
-    "default": {
-      "source": "huggingFace",
-      "model": "BAAI/bge-base-en-v1.5",
-      "revision": "617ca489d9e86b49b8167676d8220688b99db36e",
-      "documentTemplate": "{% for field in fields %} {{ field.name }}: {{ field.value }}\n{% endfor %}"
-    }
-  },
-  "searchCutoffMs": null
+  "id": "e3",
+  "desc": "overriden vector + map",
+  "_vectors": {
+    "default": [
+      0.2,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1,
+      0.1
+    ],
+    "toto": [
+      0.1
+    ]
+  }
 }
--- a/dump/src/reader/snapshots/dumpreadertest__import_dump_v6_with_vectors-6.snap
+++ b/dump/src/reader/snapshots/dumpreadertest__import_dump_v6_with_vectors-6.snap
--- a/dump/src/reader/snapshots/dumpreadertest__import_dump_v6_with_vectors-7.snap
+++ b/dump/src/reader/snapshots/dumpreadertest__import_dump_v6_with_vectors-7.snap
--- a/dump/src/reader/snapshots/dumpreadertest__import_dump_v6_with_vectors-8.snap
+++ b/dump/src/reader/snapshots/dumpreadertest__import_dump_v6_with_vectors-8.snap
--- a/dump/src/reader/snapshots/dumpreadertest__import_dump_v6_with_vectors-9.snap
+++ b/dump/src/reader/snapshots/dumpreadertest__import_dump_v6_with_vectors-9.snap
@@ -1,780 +0,0 @@
---
-source: dump/src/reader/mod.rs
-expression: document
---
-{
-  "id": "e0",
-  "desc": "overriden vector",
-  "_vectors": {
-    "default": [
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1,
-      0.1
-    ]
-  }
-}
--- a/filter-parser/src/condition.rs
+++ b/filter-parser/src/condition.rs
@@ -27,7 +27,6 @@ pub enum Condition<'a> {
    LowerThanOrEqual(Token<'a>),
    Between { from: Token<'a>, to: Token<'a> },
    Contains { keyword: Token<'a>, word: Token<'a> },
-    StartsWith { keyword: Token<'a>, word: Token<'a> },
 }

 /// condition      = value ("==" | ">" ...) value
@@ -122,34 +121,6 @@ pub fn parse_not_contains(input: Span) -> IResult<FilterCondition> {
    ))
 }

-/// starts with        = value "CONTAINS" value
-pub fn parse_starts_with(input: Span) -> IResult<FilterCondition> {
-    let (input, (fid, starts_with, value)) =
-        tuple((parse_value, tag("STARTS WITH"), cut(parse_value)))(input)?;
-    Ok((
-        input,
-        FilterCondition::Condition {
-            fid,
-            op: StartsWith { keyword: Token { span: starts_with, value: None }, word: value },
-        },
-    ))
-}
-
-/// starts with        = value "NOT" WS+ "CONTAINS" value
-pub fn parse_not_starts_with(input: Span) -> IResult<FilterCondition> {
-    let keyword = tuple((tag("NOT"), multispace1, tag("STARTS WITH")));
-    let (input, (fid, (_not, _spaces, starts_with), value)) =
-        tuple((parse_value, keyword, cut(parse_value)))(input)?;
-
-    Ok((
-        input,
-        FilterCondition::Not(Box::new(FilterCondition::Condition {
-            fid,
-            op: StartsWith { keyword: Token { span: starts_with, value: None }, word: value },
-        })),
-    ))
-}
-
 /// to             = value value "TO" WS+ value
 pub fn parse_to(input: Span) -> IResult<FilterCondition> {
    let (input, (key, from, _, _, to)) =
--- a/filter-parser/src/error.rs
+++ b/filter-parser/src/error.rs
@@ -146,7 +146,7 @@ impl<'a> Display for Error<'a> {
            }
            ErrorKind::InvalidPrimary => {
                let text = if input.trim().is_empty() { "but instead got nothing.".to_string() } else { format!("at `{}`.", escaped_input) };
-                writeln!(f, "Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `IN`, `NOT IN`, `TO`, `EXISTS`, `NOT EXISTS`, `IS NULL`, `IS NOT NULL`, `IS EMPTY`, `IS NOT EMPTY`, `CONTAINS`, `NOT CONTAINS`, `STARTS WITH`, `NOT STARTS WITH`, `_geoRadius`, or `_geoBoundingBox` {}", text)?
+                writeln!(f, "Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `IN`, `NOT IN`, `TO`, `EXISTS`, `NOT EXISTS`, `IS NULL`, `IS NOT NULL`, `IS EMPTY`, `IS NOT EMPTY`, `CONTAINS`, `NOT CONTAINS`, `_geoRadius`, or `_geoBoundingBox` {}", text)?
            }
            ErrorKind::InvalidEscapedNumber => {
                writeln!(f, "Found an invalid escaped sequence number: `{}`.", escaped_input)?
--- a/filter-parser/src/lib.rs
+++ b/filter-parser/src/lib.rs
@@ -49,7 +49,7 @@ use std::fmt::Debug;
 pub use condition::{parse_condition, parse_to, Condition};
 use condition::{
    parse_contains, parse_exists, parse_is_empty, parse_is_not_empty, parse_is_not_null,
-    parse_is_null, parse_not_contains, parse_not_exists, parse_not_starts_with, parse_starts_with,
+    parse_is_null, parse_not_contains, parse_not_exists,
 };
 use error::{cut_with_err, ExpectedValueKind, NomErrorExt};
 pub use error::{Error, ErrorKind};
@@ -166,8 +166,7 @@ impl<'a> FilterCondition<'a> {
                | Condition::LowerThan(_)
                | Condition::LowerThanOrEqual(_)
                | Condition::Between { .. } => None,
-                Condition::Contains { keyword, word: _ }
-                | Condition::StartsWith { keyword, word: _ } => Some(keyword),
+                Condition::Contains { keyword, word: _ } => Some(keyword),
            },
            FilterCondition::Not(this) => this.use_contains_operator(),
            FilterCondition::Or(seq) | FilterCondition::And(seq) => {
@@ -485,8 +484,6 @@ fn parse_primary(input: Span, depth: usize) -> IResult<FilterCondition> {
        parse_to,
        parse_contains,
        parse_not_contains,
-        parse_starts_with,
-        parse_not_starts_with,
        // the next lines are only for error handling and are written at the end to have the less possible performance impact
        parse_geo,
        parse_geo_distance,
@@ -570,7 +567,6 @@ impl<'a> std::fmt::Display for Condition<'a> {
            Condition::LowerThanOrEqual(token) => write!(f, "<= {token}"),
            Condition::Between { from, to } => write!(f, "{from} TO {to}"),
            Condition::Contains { word, keyword: _ } => write!(f, "CONTAINS {word}"),
-            Condition::StartsWith { word, keyword: _ } => write!(f, "STARTS WITH {word}"),
        }
    }
 }
@@ -684,13 +680,6 @@ pub mod tests {
        insta::assert_snapshot!(p("NOT subscribers NOT CONTAINS 'hello'"), @"{subscribers} CONTAINS {hello}");
        insta::assert_snapshot!(p("subscribers NOT   CONTAINS 'hello'"), @"NOT ({subscribers} CONTAINS {hello})");

-        // Test STARTS WITH + NOT STARTS WITH
-        insta::assert_snapshot!(p("subscribers STARTS WITH 'hel'"), @"{subscribers} STARTS WITH {hel}");
-        insta::assert_snapshot!(p("NOT subscribers STARTS WITH 'hel'"), @"NOT ({subscribers} STARTS WITH {hel})");
-        insta::assert_snapshot!(p("subscribers NOT STARTS WITH hel"), @"NOT ({subscribers} STARTS WITH {hel})");
-        insta::assert_snapshot!(p("NOT subscribers NOT STARTS WITH 'hel'"), @"{subscribers} STARTS WITH {hel}");
-        insta::assert_snapshot!(p("subscribers NOT   STARTS WITH 'hel'"), @"NOT ({subscribers} STARTS WITH {hel})");
-
        // Test nested NOT
        insta::assert_snapshot!(p("NOT NOT NOT NOT x = 5"), @"{x} = {5}");
        insta::assert_snapshot!(p("NOT NOT (NOT NOT x = 5)"), @"{x} = {5}");
@@ -762,7 +751,7 @@ pub mod tests {
        "###);

        insta::assert_snapshot!(p("'OR'"), @r###"
-        Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `IN`, `NOT IN`, `TO`, `EXISTS`, `NOT EXISTS`, `IS NULL`, `IS NOT NULL`, `IS EMPTY`, `IS NOT EMPTY`, `CONTAINS`, `NOT CONTAINS`, `STARTS WITH`, `NOT STARTS WITH`, `_geoRadius`, or `_geoBoundingBox` at `\'OR\'`.
+        Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `IN`, `NOT IN`, `TO`, `EXISTS`, `NOT EXISTS`, `IS NULL`, `IS NOT NULL`, `IS EMPTY`, `IS NOT EMPTY`, `CONTAINS`, `NOT CONTAINS`, `_geoRadius`, or `_geoBoundingBox` at `\'OR\'`.
        1:5 'OR'
        "###);

@@ -772,12 +761,12 @@ pub mod tests {
        "###);

        insta::assert_snapshot!(p("channel Ponce"), @r###"
-        Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `IN`, `NOT IN`, `TO`, `EXISTS`, `NOT EXISTS`, `IS NULL`, `IS NOT NULL`, `IS EMPTY`, `IS NOT EMPTY`, `CONTAINS`, `NOT CONTAINS`, `STARTS WITH`, `NOT STARTS WITH`, `_geoRadius`, or `_geoBoundingBox` at `channel Ponce`.
+        Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `IN`, `NOT IN`, `TO`, `EXISTS`, `NOT EXISTS`, `IS NULL`, `IS NOT NULL`, `IS EMPTY`, `IS NOT EMPTY`, `CONTAINS`, `NOT CONTAINS`, `_geoRadius`, or `_geoBoundingBox` at `channel Ponce`.
        1:14 channel Ponce
        "###);

        insta::assert_snapshot!(p("channel = Ponce OR"), @r###"
-        Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `IN`, `NOT IN`, `TO`, `EXISTS`, `NOT EXISTS`, `IS NULL`, `IS NOT NULL`, `IS EMPTY`, `IS NOT EMPTY`, `CONTAINS`, `NOT CONTAINS`, `STARTS WITH`, `NOT STARTS WITH`, `_geoRadius`, or `_geoBoundingBox` but instead got nothing.
+        Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `IN`, `NOT IN`, `TO`, `EXISTS`, `NOT EXISTS`, `IS NULL`, `IS NOT NULL`, `IS EMPTY`, `IS NOT EMPTY`, `CONTAINS`, `NOT CONTAINS`, `_geoRadius`, or `_geoBoundingBox` but instead got nothing.
        19:19 channel = Ponce OR
        "###);

@@ -862,12 +851,12 @@ pub mod tests {
        "###);

        insta::assert_snapshot!(p("colour NOT EXIST"), @r###"
-        Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `IN`, `NOT IN`, `TO`, `EXISTS`, `NOT EXISTS`, `IS NULL`, `IS NOT NULL`, `IS EMPTY`, `IS NOT EMPTY`, `CONTAINS`, `NOT CONTAINS`, `STARTS WITH`, `NOT STARTS WITH`, `_geoRadius`, or `_geoBoundingBox` at `colour NOT EXIST`.
+        Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `IN`, `NOT IN`, `TO`, `EXISTS`, `NOT EXISTS`, `IS NULL`, `IS NOT NULL`, `IS EMPTY`, `IS NOT EMPTY`, `CONTAINS`, `NOT CONTAINS`, `_geoRadius`, or `_geoBoundingBox` at `colour NOT EXIST`.
        1:17 colour NOT EXIST
        "###);

        insta::assert_snapshot!(p("subscribers 100 TO1000"), @r###"
-        Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `IN`, `NOT IN`, `TO`, `EXISTS`, `NOT EXISTS`, `IS NULL`, `IS NOT NULL`, `IS EMPTY`, `IS NOT EMPTY`, `CONTAINS`, `NOT CONTAINS`, `STARTS WITH`, `NOT STARTS WITH`, `_geoRadius`, or `_geoBoundingBox` at `subscribers 100 TO1000`.
+        Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `IN`, `NOT IN`, `TO`, `EXISTS`, `NOT EXISTS`, `IS NULL`, `IS NOT NULL`, `IS EMPTY`, `IS NOT EMPTY`, `CONTAINS`, `NOT CONTAINS`, `_geoRadius`, or `_geoBoundingBox` at `subscribers 100 TO1000`.
        1:23 subscribers 100 TO1000
        "###);

@@ -930,35 +919,35 @@ pub mod tests {
        "###);

        insta::assert_snapshot!(p(r#"value NULL"#), @r###"
-        Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `IN`, `NOT IN`, `TO`, `EXISTS`, `NOT EXISTS`, `IS NULL`, `IS NOT NULL`, `IS EMPTY`, `IS NOT EMPTY`, `CONTAINS`, `NOT CONTAINS`, `STARTS WITH`, `NOT STARTS WITH`, `_geoRadius`, or `_geoBoundingBox` at `value NULL`.
+        Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `IN`, `NOT IN`, `TO`, `EXISTS`, `NOT EXISTS`, `IS NULL`, `IS NOT NULL`, `IS EMPTY`, `IS NOT EMPTY`, `CONTAINS`, `NOT CONTAINS`, `_geoRadius`, or `_geoBoundingBox` at `value NULL`.
        1:11 value NULL
        "###);
        insta::assert_snapshot!(p(r#"value NOT NULL"#), @r###"
-        Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `IN`, `NOT IN`, `TO`, `EXISTS`, `NOT EXISTS`, `IS NULL`, `IS NOT NULL`, `IS EMPTY`, `IS NOT EMPTY`, `CONTAINS`, `NOT CONTAINS`, `STARTS WITH`, `NOT STARTS WITH`, `_geoRadius`, or `_geoBoundingBox` at `value NOT NULL`.
+        Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `IN`, `NOT IN`, `TO`, `EXISTS`, `NOT EXISTS`, `IS NULL`, `IS NOT NULL`, `IS EMPTY`, `IS NOT EMPTY`, `CONTAINS`, `NOT CONTAINS`, `_geoRadius`, or `_geoBoundingBox` at `value NOT NULL`.
        1:15 value NOT NULL
        "###);
        insta::assert_snapshot!(p(r#"value EMPTY"#), @r###"
-        Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `IN`, `NOT IN`, `TO`, `EXISTS`, `NOT EXISTS`, `IS NULL`, `IS NOT NULL`, `IS EMPTY`, `IS NOT EMPTY`, `CONTAINS`, `NOT CONTAINS`, `STARTS WITH`, `NOT STARTS WITH`, `_geoRadius`, or `_geoBoundingBox` at `value EMPTY`.
+        Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `IN`, `NOT IN`, `TO`, `EXISTS`, `NOT EXISTS`, `IS NULL`, `IS NOT NULL`, `IS EMPTY`, `IS NOT EMPTY`, `CONTAINS`, `NOT CONTAINS`, `_geoRadius`, or `_geoBoundingBox` at `value EMPTY`.
        1:12 value EMPTY
        "###);
        insta::assert_snapshot!(p(r#"value NOT EMPTY"#), @r###"
-        Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `IN`, `NOT IN`, `TO`, `EXISTS`, `NOT EXISTS`, `IS NULL`, `IS NOT NULL`, `IS EMPTY`, `IS NOT EMPTY`, `CONTAINS`, `NOT CONTAINS`, `STARTS WITH`, `NOT STARTS WITH`, `_geoRadius`, or `_geoBoundingBox` at `value NOT EMPTY`.
+        Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `IN`, `NOT IN`, `TO`, `EXISTS`, `NOT EXISTS`, `IS NULL`, `IS NOT NULL`, `IS EMPTY`, `IS NOT EMPTY`, `CONTAINS`, `NOT CONTAINS`, `_geoRadius`, or `_geoBoundingBox` at `value NOT EMPTY`.
        1:16 value NOT EMPTY
        "###);
        insta::assert_snapshot!(p(r#"value IS"#), @r###"
-        Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `IN`, `NOT IN`, `TO`, `EXISTS`, `NOT EXISTS`, `IS NULL`, `IS NOT NULL`, `IS EMPTY`, `IS NOT EMPTY`, `CONTAINS`, `NOT CONTAINS`, `STARTS WITH`, `NOT STARTS WITH`, `_geoRadius`, or `_geoBoundingBox` at `value IS`.
+        Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `IN`, `NOT IN`, `TO`, `EXISTS`, `NOT EXISTS`, `IS NULL`, `IS NOT NULL`, `IS EMPTY`, `IS NOT EMPTY`, `CONTAINS`, `NOT CONTAINS`, `_geoRadius`, or `_geoBoundingBox` at `value IS`.
        1:9 value IS
        "###);
        insta::assert_snapshot!(p(r#"value IS NOT"#), @r###"
-        Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `IN`, `NOT IN`, `TO`, `EXISTS`, `NOT EXISTS`, `IS NULL`, `IS NOT NULL`, `IS EMPTY`, `IS NOT EMPTY`, `CONTAINS`, `NOT CONTAINS`, `STARTS WITH`, `NOT STARTS WITH`, `_geoRadius`, or `_geoBoundingBox` at `value IS NOT`.
+        Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `IN`, `NOT IN`, `TO`, `EXISTS`, `NOT EXISTS`, `IS NULL`, `IS NOT NULL`, `IS EMPTY`, `IS NOT EMPTY`, `CONTAINS`, `NOT CONTAINS`, `_geoRadius`, or `_geoBoundingBox` at `value IS NOT`.
        1:13 value IS NOT
        "###);
        insta::assert_snapshot!(p(r#"value IS EXISTS"#), @r###"
-        Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `IN`, `NOT IN`, `TO`, `EXISTS`, `NOT EXISTS`, `IS NULL`, `IS NOT NULL`, `IS EMPTY`, `IS NOT EMPTY`, `CONTAINS`, `NOT CONTAINS`, `STARTS WITH`, `NOT STARTS WITH`, `_geoRadius`, or `_geoBoundingBox` at `value IS EXISTS`.
+        Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `IN`, `NOT IN`, `TO`, `EXISTS`, `NOT EXISTS`, `IS NULL`, `IS NOT NULL`, `IS EMPTY`, `IS NOT EMPTY`, `CONTAINS`, `NOT CONTAINS`, `_geoRadius`, or `_geoBoundingBox` at `value IS EXISTS`.
        1:16 value IS EXISTS
        "###);
        insta::assert_snapshot!(p(r#"value IS NOT EXISTS"#), @r###"
-        Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `IN`, `NOT IN`, `TO`, `EXISTS`, `NOT EXISTS`, `IS NULL`, `IS NOT NULL`, `IS EMPTY`, `IS NOT EMPTY`, `CONTAINS`, `NOT CONTAINS`, `STARTS WITH`, `NOT STARTS WITH`, `_geoRadius`, or `_geoBoundingBox` at `value IS NOT EXISTS`.
+        Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `IN`, `NOT IN`, `TO`, `EXISTS`, `NOT EXISTS`, `IS NULL`, `IS NOT NULL`, `IS EMPTY`, `IS NOT EMPTY`, `CONTAINS`, `NOT CONTAINS`, `_geoRadius`, or `_geoBoundingBox` at `value IS NOT EXISTS`.
        1:20 value IS NOT EXISTS
        "###);
    }
--- a/filter-parser/src/value.rs
+++ b/filter-parser/src/value.rs
@@ -212,8 +212,6 @@ fn is_keyword(s: &str) -> bool {
            | "NULL"
            | "EMPTY"
            | "CONTAINS"
-            | "STARTS"
-            | "WITH"
            | "_geoRadius"
            | "_geoBoundingBox"
    )
--- a/index-scheduler/Cargo.toml
+++ b/index-scheduler/Cargo.toml
@@ -29,7 +29,6 @@ serde_json = { version = "1.0.120", features = ["preserve_order"] }
 synchronoise = "1.0.1"
 tempfile = "3.10.1"
 thiserror = "1.0.61"
-memmap2 = "0.9.4"
 time = { version = "0.3.36", features = [
    "serde-well-known",
    "formatting",
@@ -41,7 +40,7 @@ ureq = "2.10.0"
 uuid = { version = "1.10.0", features = ["serde", "v4"] }

 [dev-dependencies]
-arroy = { git = "https://github.com/meilisearch/arroy/", rev = "2386594dfb009ce08821a925ccc89fb8e30bf73d" }
+arroy = "0.4.0"
 big_s = "1.0.2"
 crossbeam = "0.8.4"
 insta = { version = "1.39.0", features = ["json", "redactions"] }
--- a/index-scheduler/src/autobatcher.rs
+++ b/index-scheduler/src/autobatcher.rs
@@ -25,9 +25,8 @@ enum AutobatchKind {
        primary_key: Option<String>,
    },
    DocumentEdition,
-    DocumentDeletion {
-        by_filter: bool,
-    },
+    DocumentDeletion,
+    DocumentDeletionByFilter,
    DocumentClear,
    Settings {
        allow_index_creation: bool,
@@ -66,12 +65,10 @@ impl From<KindWithContent> for AutobatchKind {
                ..
            } => AutobatchKind::DocumentImport { method, allow_index_creation, primary_key },
            KindWithContent::DocumentEdition { .. } => AutobatchKind::DocumentEdition,
-            KindWithContent::DocumentDeletion { .. } => {
-                AutobatchKind::DocumentDeletion { by_filter: false }
-            }
+            KindWithContent::DocumentDeletion { .. } => AutobatchKind::DocumentDeletion,
            KindWithContent::DocumentClear { .. } => AutobatchKind::DocumentClear,
            KindWithContent::DocumentDeletionByFilter { .. } => {
-                AutobatchKind::DocumentDeletion { by_filter: true }
+                AutobatchKind::DocumentDeletionByFilter
            }
            KindWithContent::SettingsUpdate { allow_index_creation, is_deletion, .. } => {
                AutobatchKind::Settings {
@@ -108,7 +105,9 @@ pub enum BatchKind {
    },
    DocumentDeletion {
        deletion_ids: Vec<TaskId>,
-        includes_by_filter: bool,
+    },
+    DocumentDeletionByFilter {
+        id: TaskId,
    },
    ClearAndSettings {
        other: Vec<TaskId>,
@@ -206,13 +205,12 @@ impl BatchKind {
                allow_index_creation,
            ),
            K::DocumentEdition => (Break(BatchKind::DocumentEdition { id: task_id }), false),
-            K::DocumentDeletion { by_filter: includes_by_filter } => (
-                Continue(BatchKind::DocumentDeletion {
-                    deletion_ids: vec![task_id],
-                    includes_by_filter,
-                }),
-                false,
-            ),
+            K::DocumentDeletion => {
+                (Continue(BatchKind::DocumentDeletion { deletion_ids: vec![task_id] }), false)
+            }
+            K::DocumentDeletionByFilter => {
+                (Break(BatchKind::DocumentDeletionByFilter { id: task_id }), false)
+            }
            K::Settings { allow_index_creation } => (
                Continue(BatchKind::Settings { allow_index_creation, settings_ids: vec![task_id] }),
                allow_index_creation,
@@ -230,7 +228,7 @@ impl BatchKind {

        match (self, kind) {
            // We don't batch any of these operations
-            (this, K::IndexCreation | K::IndexUpdate | K::IndexSwap | K::DocumentEdition) => Break(this),
+            (this, K::IndexCreation | K::IndexUpdate | K::IndexSwap | K::DocumentEdition | K::DocumentDeletionByFilter) => Break(this),
            // We must not batch tasks that don't have the same index creation rights if the index doesn't already exists.
            (this, kind) if !index_already_exists && this.allow_index_creation() == Some(false) && kind.allow_index_creation() == Some(true) => {
                Break(this)
@@ -266,7 +264,7 @@ impl BatchKind {
            // The index deletion can batch with everything but must stop after
            (
                BatchKind::DocumentClear { mut ids }
-                | BatchKind::DocumentDeletion { deletion_ids: mut ids, includes_by_filter: _ }
+                | BatchKind::DocumentDeletion { deletion_ids: mut ids }
                | BatchKind::DocumentOperation { method: _, allow_index_creation: _, primary_key: _, operation_ids: mut ids }
                | BatchKind::Settings { allow_index_creation: _, settings_ids: mut ids },
                K::IndexDeletion,
@@ -286,7 +284,7 @@ impl BatchKind {

            (
                BatchKind::DocumentClear { mut ids },
-                K::DocumentClear | K::DocumentDeletion { by_filter: _ },
+                K::DocumentClear | K::DocumentDeletion,
            ) => {
                ids.push(id);
                Continue(BatchKind::DocumentClear { ids })
@@ -330,7 +328,7 @@ impl BatchKind {
            }
            (
                BatchKind::DocumentOperation { method, allow_index_creation, primary_key, mut operation_ids },
-                K::DocumentDeletion { by_filter: false },
+                K::DocumentDeletion,
            ) => {
                operation_ids.push(id);

@@ -341,13 +339,6 @@ impl BatchKind {
                    operation_ids,
                })
            }
-            // We can't batch a document operation with a delete by filter
-            (
-                this @ BatchKind::DocumentOperation { .. },
-                K::DocumentDeletion { by_filter: true },
-            ) => {
-                Break(this)
-            }
            // but we can't autobatch documents if it's not the same kind
            // this match branch MUST be AFTER the previous one
            (
@@ -366,18 +357,13 @@ impl BatchKind {
                operation_ids,
            }),

-            (BatchKind::DocumentDeletion { mut deletion_ids, includes_by_filter: _ }, K::DocumentClear) => {
+            (BatchKind::DocumentDeletion { mut deletion_ids }, K::DocumentClear) => {
                deletion_ids.push(id);
                Continue(BatchKind::DocumentClear { ids: deletion_ids })
            }
-            // we can't autobatch the deletion and import if the document deletion contained a filter
-            (
-                this @ BatchKind::DocumentDeletion { deletion_ids: _, includes_by_filter: true },
-                K::DocumentImport { .. }
-            ) => Break(this),
            // we can autobatch the deletion and import if the index already exists
            (
-                BatchKind::DocumentDeletion { mut deletion_ids, includes_by_filter: false },
+                BatchKind::DocumentDeletion { mut deletion_ids },
                K::DocumentImport { method, allow_index_creation, primary_key }
            ) if index_already_exists => {
                deletion_ids.push(id);
@@ -391,7 +377,7 @@ impl BatchKind {
            }
            // we can autobatch the deletion and import if both can't create an index
            (
-                BatchKind::DocumentDeletion { mut deletion_ids, includes_by_filter: false },
+                BatchKind::DocumentDeletion { mut deletion_ids },
                K::DocumentImport { method, allow_index_creation, primary_key }
            ) if !allow_index_creation => {
                deletion_ids.push(id);
@@ -410,9 +396,9 @@ impl BatchKind {
            ) => {
                Break(this)
            }
-            (BatchKind::DocumentDeletion { mut deletion_ids, includes_by_filter }, K::DocumentDeletion { by_filter }) => {
+            (BatchKind::DocumentDeletion { mut deletion_ids }, K::DocumentDeletion) => {
                deletion_ids.push(id);
-                Continue(BatchKind::DocumentDeletion { deletion_ids, includes_by_filter: includes_by_filter | by_filter })
+                Continue(BatchKind::DocumentDeletion { deletion_ids })
            }
            (this @ BatchKind::DocumentDeletion { .. }, K::Settings { .. }) => Break(this),

@@ -426,7 +412,7 @@ impl BatchKind {
            }),
            (
                this @ BatchKind::Settings { .. },
-                K::DocumentImport { .. } | K::DocumentDeletion { .. },
+                K::DocumentImport { .. } | K::DocumentDeletion,
            ) => Break(this),
            (
                BatchKind::Settings { mut settings_ids, allow_index_creation },
@@ -457,7 +443,7 @@ impl BatchKind {
                    settings_ids,
                    allow_index_creation,
                },
-                K::DocumentDeletion { .. },
+                K::DocumentDeletion,
            ) => {
                other.push(id);
                Continue(BatchKind::ClearAndSettings {
@@ -519,7 +505,7 @@ impl BatchKind {
            // this MUST be AFTER the two previous branch
            (
                this @ BatchKind::SettingsAndDocumentOperation { .. },
-                K::DocumentDeletion { .. } | K::DocumentImport { .. },
+                K::DocumentDeletion | K::DocumentImport { .. },
            ) => Break(this),
            (
                BatchKind::SettingsAndDocumentOperation { mut settings_ids, method, allow_index_creation,primary_key, operation_ids },
@@ -539,7 +525,8 @@ impl BatchKind {
                | BatchKind::IndexDeletion { .. }
                | BatchKind::IndexUpdate { .. }
                | BatchKind::IndexSwap { .. }
-                | BatchKind::DocumentEdition { .. },
+                | BatchKind::DocumentEdition { .. }
+                | BatchKind::DocumentDeletionByFilter { .. },
                _,
            ) => {
                unreachable!()
@@ -629,13 +616,6 @@ mod tests {
        }
    }

-    fn doc_del_fil() -> KindWithContent {
-        KindWithContent::DocumentDeletionByFilter {
-            index_uid: String::from("doggo"),
-            filter_expr: serde_json::json!("cuteness > 100"),
-        }
-    }
-
    fn doc_clr() -> KindWithContent {
        KindWithContent::DocumentClear { index_uid: String::from("doggo") }
    }
@@ -696,16 +676,10 @@ mod tests {
        debug_snapshot!(autobatch_from(false,None,  [doc_imp(UpdateDocuments, false, None), doc_imp(UpdateDocuments, false, None), doc_imp(UpdateDocuments, false, None)]), @"Some((DocumentOperation { method: UpdateDocuments, allow_index_creation: false, primary_key: None, operation_ids: [0, 1, 2] }, false))");

        // we can autobatch one or multiple DocumentDeletion together
-        debug_snapshot!(autobatch_from(true, None, [doc_del()]), @"Some((DocumentDeletion { deletion_ids: [0], includes_by_filter: false }, false))");
-        debug_snapshot!(autobatch_from(true, None, [doc_del(), doc_del(), doc_del()]), @"Some((DocumentDeletion { deletion_ids: [0, 1, 2], includes_by_filter: false }, false))");
-        debug_snapshot!(autobatch_from(false,None,  [doc_del()]), @"Some((DocumentDeletion { deletion_ids: [0], includes_by_filter: false }, false))");
-        debug_snapshot!(autobatch_from(false,None,  [doc_del(), doc_del(), doc_del()]), @"Some((DocumentDeletion { deletion_ids: [0, 1, 2], includes_by_filter: false }, false))");
-
-        // we can autobatch one or multiple DocumentDeletionByFilter together
-        debug_snapshot!(autobatch_from(true, None, [doc_del_fil()]), @"Some((DocumentDeletion { deletion_ids: [0], includes_by_filter: true }, false))");
-        debug_snapshot!(autobatch_from(true, None, [doc_del_fil(), doc_del_fil(), doc_del_fil()]), @"Some((DocumentDeletion { deletion_ids: [0, 1, 2], includes_by_filter: true }, false))");
-        debug_snapshot!(autobatch_from(false,None,  [doc_del_fil()]), @"Some((DocumentDeletion { deletion_ids: [0], includes_by_filter: true }, false))");
-        debug_snapshot!(autobatch_from(false,None,  [doc_del_fil(), doc_del_fil(), doc_del_fil()]), @"Some((DocumentDeletion { deletion_ids: [0, 1, 2], includes_by_filter: true }, false))");
+        debug_snapshot!(autobatch_from(true, None, [doc_del()]), @"Some((DocumentDeletion { deletion_ids: [0] }, false))");
+        debug_snapshot!(autobatch_from(true, None, [doc_del(), doc_del(), doc_del()]), @"Some((DocumentDeletion { deletion_ids: [0, 1, 2] }, false))");
+        debug_snapshot!(autobatch_from(false,None,  [doc_del()]), @"Some((DocumentDeletion { deletion_ids: [0] }, false))");
+        debug_snapshot!(autobatch_from(false,None,  [doc_del(), doc_del(), doc_del()]), @"Some((DocumentDeletion { deletion_ids: [0, 1, 2] }, false))");

        // we can autobatch one or multiple Settings together
        debug_snapshot!(autobatch_from(true, None, [settings(true)]), @"Some((Settings { allow_index_creation: true, settings_ids: [0] }, true))");
@@ -748,63 +722,25 @@ mod tests {
        debug_snapshot!(autobatch_from(false, None, [doc_del(), doc_imp(UpdateDocuments, false, None)]), @"Some((DocumentOperation { method: UpdateDocuments, allow_index_creation: false, primary_key: None, operation_ids: [0, 1] }, false))");
        debug_snapshot!(autobatch_from(false, None, [doc_del(), doc_imp(ReplaceDocuments, false, Some("catto"))]), @r###"Some((DocumentOperation { method: ReplaceDocuments, allow_index_creation: false, primary_key: Some("catto"), operation_ids: [0, 1] }, false))"###);
        debug_snapshot!(autobatch_from(false, None, [doc_del(), doc_imp(UpdateDocuments, false, Some("catto"))]), @r###"Some((DocumentOperation { method: UpdateDocuments, allow_index_creation: false, primary_key: Some("catto"), operation_ids: [0, 1] }, false))"###);
-
-        // But we can't autobatch document addition with document deletion by filter
-        debug_snapshot!(autobatch_from(true, None, [doc_imp(ReplaceDocuments, true, None), doc_del_fil()]), @"Some((DocumentOperation { method: ReplaceDocuments, allow_index_creation: true, primary_key: None, operation_ids: [0] }, true))");
-        debug_snapshot!(autobatch_from(true, None, [doc_imp(UpdateDocuments, true, None), doc_del_fil()]), @"Some((DocumentOperation { method: UpdateDocuments, allow_index_creation: true, primary_key: None, operation_ids: [0] }, true))");
-        debug_snapshot!(autobatch_from(true, None, [doc_imp(ReplaceDocuments, false, None), doc_del_fil()]), @"Some((DocumentOperation { method: ReplaceDocuments, allow_index_creation: false, primary_key: None, operation_ids: [0] }, false))");
-        debug_snapshot!(autobatch_from(true, None, [doc_imp(UpdateDocuments, false, None), doc_del_fil()]), @"Some((DocumentOperation { method: UpdateDocuments, allow_index_creation: false, primary_key: None, operation_ids: [0] }, false))");
-        debug_snapshot!(autobatch_from(true, None, [doc_imp(ReplaceDocuments, true, Some("catto")), doc_del_fil()]), @r###"Some((DocumentOperation { method: ReplaceDocuments, allow_index_creation: true, primary_key: Some("catto"), operation_ids: [0] }, true))"###);
-        debug_snapshot!(autobatch_from(true, None, [doc_imp(UpdateDocuments, true, Some("catto")), doc_del_fil()]), @r###"Some((DocumentOperation { method: UpdateDocuments, allow_index_creation: true, primary_key: Some("catto"), operation_ids: [0] }, true))"###);
-        debug_snapshot!(autobatch_from(true, None, [doc_imp(ReplaceDocuments, false, Some("catto")), doc_del_fil()]), @r###"Some((DocumentOperation { method: ReplaceDocuments, allow_index_creation: false, primary_key: Some("catto"), operation_ids: [0] }, false))"###);
-        debug_snapshot!(autobatch_from(true, None, [doc_imp(UpdateDocuments, false, Some("catto")), doc_del_fil()]), @r###"Some((DocumentOperation { method: UpdateDocuments, allow_index_creation: false, primary_key: Some("catto"), operation_ids: [0] }, false))"###);
-        debug_snapshot!(autobatch_from(false, None, [doc_imp(ReplaceDocuments, true, None), doc_del_fil()]), @"Some((DocumentOperation { method: ReplaceDocuments, allow_index_creation: true, primary_key: None, operation_ids: [0] }, true))");
-        debug_snapshot!(autobatch_from(false, None, [doc_imp(UpdateDocuments, true, None), doc_del_fil()]), @"Some((DocumentOperation { method: UpdateDocuments, allow_index_creation: true, primary_key: None, operation_ids: [0] }, true))");
-        debug_snapshot!(autobatch_from(false, None, [doc_imp(ReplaceDocuments, false, None), doc_del_fil()]), @"Some((DocumentOperation { method: ReplaceDocuments, allow_index_creation: false, primary_key: None, operation_ids: [0] }, false))");
-        debug_snapshot!(autobatch_from(false, None, [doc_imp(UpdateDocuments, false, None), doc_del_fil()]), @"Some((DocumentOperation { method: UpdateDocuments, allow_index_creation: false, primary_key: None, operation_ids: [0] }, false))");
-        debug_snapshot!(autobatch_from(false, None, [doc_imp(ReplaceDocuments, true, Some("catto")), doc_del_fil()]), @r###"Some((DocumentOperation { method: ReplaceDocuments, allow_index_creation: true, primary_key: Some("catto"), operation_ids: [0] }, true))"###);
-        debug_snapshot!(autobatch_from(false, None, [doc_imp(UpdateDocuments, true, Some("catto")), doc_del_fil()]), @r###"Some((DocumentOperation { method: UpdateDocuments, allow_index_creation: true, primary_key: Some("catto"), operation_ids: [0] }, true))"###);
-        debug_snapshot!(autobatch_from(false, None, [doc_imp(ReplaceDocuments, false, Some("catto")), doc_del_fil()]), @r###"Some((DocumentOperation { method: ReplaceDocuments, allow_index_creation: false, primary_key: Some("catto"), operation_ids: [0] }, false))"###);
-        debug_snapshot!(autobatch_from(false, None, [doc_imp(UpdateDocuments, false, Some("catto")), doc_del_fil()]), @r###"Some((DocumentOperation { method: UpdateDocuments, allow_index_creation: false, primary_key: Some("catto"), operation_ids: [0] }, false))"###);
-        // And the other way around
-        debug_snapshot!(autobatch_from(true, None, [doc_del_fil(), doc_imp(ReplaceDocuments, true, None)]), @"Some((DocumentDeletion { deletion_ids: [0], includes_by_filter: true }, false))");
-        debug_snapshot!(autobatch_from(true, None, [doc_del_fil(), doc_imp(UpdateDocuments, true, None)]), @"Some((DocumentDeletion { deletion_ids: [0], includes_by_filter: true }, false))");
-        debug_snapshot!(autobatch_from(true, None, [doc_del_fil(), doc_imp(ReplaceDocuments, false, None)]), @"Some((DocumentDeletion { deletion_ids: [0], includes_by_filter: true }, false))");
-        debug_snapshot!(autobatch_from(true, None, [doc_del_fil(), doc_imp(UpdateDocuments, false, None)]), @"Some((DocumentDeletion { deletion_ids: [0], includes_by_filter: true }, false))");
-        debug_snapshot!(autobatch_from(true, None, [doc_del_fil(), doc_imp(ReplaceDocuments, true, Some("catto"))]), @"Some((DocumentDeletion { deletion_ids: [0], includes_by_filter: true }, false))");
-        debug_snapshot!(autobatch_from(true, None, [doc_del_fil(), doc_imp(UpdateDocuments, true, Some("catto"))]), @"Some((DocumentDeletion { deletion_ids: [0], includes_by_filter: true }, false))");
-        debug_snapshot!(autobatch_from(true, None, [doc_del_fil(), doc_imp(ReplaceDocuments, false, Some("catto"))]), @"Some((DocumentDeletion { deletion_ids: [0], includes_by_filter: true }, false))");
-        debug_snapshot!(autobatch_from(true, None, [doc_del_fil(), doc_imp(UpdateDocuments, false, Some("catto"))]), @"Some((DocumentDeletion { deletion_ids: [0], includes_by_filter: true }, false))");
-        debug_snapshot!(autobatch_from(false, None, [doc_del_fil(), doc_imp(ReplaceDocuments, false, None)]), @"Some((DocumentDeletion { deletion_ids: [0], includes_by_filter: true }, false))");
-        debug_snapshot!(autobatch_from(false, None, [doc_del_fil(), doc_imp(UpdateDocuments, false, None)]), @"Some((DocumentDeletion { deletion_ids: [0], includes_by_filter: true }, false))");
-        debug_snapshot!(autobatch_from(false, None, [doc_del_fil(), doc_imp(ReplaceDocuments, false, Some("catto"))]), @"Some((DocumentDeletion { deletion_ids: [0], includes_by_filter: true }, false))");
-        debug_snapshot!(autobatch_from(false, None, [doc_del_fil(), doc_imp(UpdateDocuments, false, Some("catto"))]), @"Some((DocumentDeletion { deletion_ids: [0], includes_by_filter: true }, false))");
    }

    #[test]
    fn simple_document_operation_dont_autobatch_with_other() {
-        // addition, updates and deletion by filter can't batch together
+        // addition, updates and deletion can't batch together
        debug_snapshot!(autobatch_from(true, None, [doc_imp(ReplaceDocuments, true, None), doc_imp(UpdateDocuments, true, None)]), @"Some((DocumentOperation { method: ReplaceDocuments, allow_index_creation: true, primary_key: None, operation_ids: [0] }, true))");
        debug_snapshot!(autobatch_from(true, None, [doc_imp(UpdateDocuments, true, None), doc_imp(ReplaceDocuments, true, None)]), @"Some((DocumentOperation { method: UpdateDocuments, allow_index_creation: true, primary_key: None, operation_ids: [0] }, true))");
-        debug_snapshot!(autobatch_from(true, None, [doc_imp(UpdateDocuments, true, None), doc_del_fil()]), @"Some((DocumentOperation { method: UpdateDocuments, allow_index_creation: true, primary_key: None, operation_ids: [0] }, true))");
-        debug_snapshot!(autobatch_from(true, None, [doc_imp(ReplaceDocuments, true, None), doc_del_fil()]), @"Some((DocumentOperation { method: ReplaceDocuments, allow_index_creation: true, primary_key: None, operation_ids: [0] }, true))");
-        debug_snapshot!(autobatch_from(true, None, [doc_del_fil(), doc_imp(UpdateDocuments, true, None)]), @"Some((DocumentDeletion { deletion_ids: [0], includes_by_filter: true }, false))");
-        debug_snapshot!(autobatch_from(true, None, [doc_del_fil(), doc_imp(ReplaceDocuments, true, None)]), @"Some((DocumentDeletion { deletion_ids: [0], includes_by_filter: true }, false))");

        debug_snapshot!(autobatch_from(true, None, [doc_imp(ReplaceDocuments, true, None), idx_create()]), @"Some((DocumentOperation { method: ReplaceDocuments, allow_index_creation: true, primary_key: None, operation_ids: [0] }, true))");
        debug_snapshot!(autobatch_from(true, None, [doc_imp(UpdateDocuments, true, None), idx_create()]), @"Some((DocumentOperation { method: UpdateDocuments, allow_index_creation: true, primary_key: None, operation_ids: [0] }, true))");
-        debug_snapshot!(autobatch_from(true, None, [doc_del(), idx_create()]), @"Some((DocumentDeletion { deletion_ids: [0], includes_by_filter: false }, false))");
-        debug_snapshot!(autobatch_from(true, None, [doc_del_fil(), idx_create()]), @"Some((DocumentDeletion { deletion_ids: [0], includes_by_filter: true }, false))");
+        debug_snapshot!(autobatch_from(true, None, [doc_del(), idx_create()]), @"Some((DocumentDeletion { deletion_ids: [0] }, false))");

        debug_snapshot!(autobatch_from(true, None, [doc_imp(ReplaceDocuments, true, None), idx_update()]), @"Some((DocumentOperation { method: ReplaceDocuments, allow_index_creation: true, primary_key: None, operation_ids: [0] }, true))");
        debug_snapshot!(autobatch_from(true, None, [doc_imp(UpdateDocuments, true, None), idx_update()]), @"Some((DocumentOperation { method: UpdateDocuments, allow_index_creation: true, primary_key: None, operation_ids: [0] }, true))");
-        debug_snapshot!(autobatch_from(true, None, [doc_del(), idx_update()]), @"Some((DocumentDeletion { deletion_ids: [0], includes_by_filter: false }, false))");
-        debug_snapshot!(autobatch_from(true, None, [doc_del_fil(), idx_update()]), @"Some((DocumentDeletion { deletion_ids: [0], includes_by_filter: true }, false))");
+        debug_snapshot!(autobatch_from(true, None, [doc_del(), idx_update()]), @"Some((DocumentDeletion { deletion_ids: [0] }, false))");

        debug_snapshot!(autobatch_from(true, None, [doc_imp(ReplaceDocuments, true, None), idx_swap()]), @"Some((DocumentOperation { method: ReplaceDocuments, allow_index_creation: true, primary_key: None, operation_ids: [0] }, true))");
        debug_snapshot!(autobatch_from(true, None, [doc_imp(UpdateDocuments, true, None), idx_swap()]), @"Some((DocumentOperation { method: UpdateDocuments, allow_index_creation: true, primary_key: None, operation_ids: [0] }, true))");
-        debug_snapshot!(autobatch_from(true, None, [doc_del(), idx_swap()]), @"Some((DocumentDeletion { deletion_ids: [0], includes_by_filter: false }, false))");
-        debug_snapshot!(autobatch_from(true, None, [doc_del_fil(), idx_swap()]), @"Some((DocumentDeletion { deletion_ids: [0], includes_by_filter: true }, false))");
+        debug_snapshot!(autobatch_from(true, None, [doc_del(), idx_swap()]), @"Some((DocumentDeletion { deletion_ids: [0] }, false))");
    }

    #[test]
@@ -871,7 +807,6 @@ mod tests {
        debug_snapshot!(autobatch_from(true, None, [idx_del(), doc_imp(ReplaceDocuments, false, None)]), @"Some((IndexDeletion { ids: [0] }, false))");
        debug_snapshot!(autobatch_from(true, None, [idx_del(), doc_imp(UpdateDocuments, false, None)]), @"Some((IndexDeletion { ids: [0] }, false))");
        debug_snapshot!(autobatch_from(true, None, [idx_del(), doc_del()]), @"Some((IndexDeletion { ids: [0] }, false))");
-        debug_snapshot!(autobatch_from(true, None, [idx_del(), doc_del_fil()]), @"Some((IndexDeletion { ids: [0] }, false))");
        debug_snapshot!(autobatch_from(true, None, [idx_del(), doc_clr()]), @"Some((IndexDeletion { ids: [0] }, false))");
        debug_snapshot!(autobatch_from(true, None, [idx_del(), settings(true)]), @"Some((IndexDeletion { ids: [0] }, false))");
        debug_snapshot!(autobatch_from(true, None, [idx_del(), settings(false)]), @"Some((IndexDeletion { ids: [0] }, false))");
@@ -881,7 +816,6 @@ mod tests {
        debug_snapshot!(autobatch_from(false,None,  [idx_del(), doc_imp(ReplaceDocuments, false, None)]), @"Some((IndexDeletion { ids: [0] }, false))");
        debug_snapshot!(autobatch_from(false,None,  [idx_del(), doc_imp(UpdateDocuments, false, None)]), @"Some((IndexDeletion { ids: [0] }, false))");
        debug_snapshot!(autobatch_from(false,None,  [idx_del(), doc_del()]), @"Some((IndexDeletion { ids: [0] }, false))");
-        debug_snapshot!(autobatch_from(false,None,  [idx_del(), doc_del_fil()]), @"Some((IndexDeletion { ids: [0] }, false))");
        debug_snapshot!(autobatch_from(false,None,  [idx_del(), doc_clr()]), @"Some((IndexDeletion { ids: [0] }, false))");
        debug_snapshot!(autobatch_from(false,None,  [idx_del(), settings(true)]), @"Some((IndexDeletion { ids: [0] }, false))");
        debug_snapshot!(autobatch_from(false,None,  [idx_del(), settings(false)]), @"Some((IndexDeletion { ids: [0] }, false))");
@@ -893,7 +827,6 @@ mod tests {
        debug_snapshot!(autobatch_from(true, None, [doc_imp(ReplaceDocuments, false, None), idx_del()]), @"Some((IndexDeletion { ids: [0, 1] }, false))");
        debug_snapshot!(autobatch_from(true, None, [doc_imp(UpdateDocuments, false, None), idx_del()]), @"Some((IndexDeletion { ids: [0, 1] }, false))");
        debug_snapshot!(autobatch_from(true, None, [doc_del(), idx_del()]), @"Some((IndexDeletion { ids: [0, 1] }, false))");
-        debug_snapshot!(autobatch_from(true, None, [doc_del_fil(), idx_del()]), @"Some((IndexDeletion { ids: [0, 1] }, false))");
        debug_snapshot!(autobatch_from(true, None, [doc_clr(), idx_del()]), @"Some((IndexDeletion { ids: [0, 1] }, false))");
        debug_snapshot!(autobatch_from(true, None, [settings(true), idx_del()]), @"Some((IndexDeletion { ids: [0, 1] }, true))");
        debug_snapshot!(autobatch_from(true, None, [settings(false), idx_del()]), @"Some((IndexDeletion { ids: [0, 1] }, false))");
@@ -903,7 +836,6 @@ mod tests {
        debug_snapshot!(autobatch_from(false,None,  [doc_imp(ReplaceDocuments, false, None), idx_del()]), @"Some((IndexDeletion { ids: [0, 1] }, false))");
        debug_snapshot!(autobatch_from(false,None,  [doc_imp(UpdateDocuments, false, None), idx_del()]), @"Some((IndexDeletion { ids: [0, 1] }, false))");
        debug_snapshot!(autobatch_from(false,None,  [doc_del(), idx_del()]), @"Some((IndexDeletion { ids: [0, 1] }, false))");
-        debug_snapshot!(autobatch_from(false,None,  [doc_del_fil(), idx_del()]), @"Some((IndexDeletion { ids: [0, 1] }, false))");
        debug_snapshot!(autobatch_from(false,None,  [doc_clr(), idx_del()]), @"Some((IndexDeletion { ids: [0, 1] }, false))");
        debug_snapshot!(autobatch_from(false,None,  [settings(true), idx_del()]), @"Some((IndexDeletion { ids: [0, 1] }, true))");
        debug_snapshot!(autobatch_from(false,None,  [settings(false), idx_del()]), @"Some((IndexDeletion { ids: [0, 1] }, false))");
@@ -969,10 +901,10 @@ mod tests {
        debug_snapshot!(autobatch_from(false,None,  [doc_imp(ReplaceDocuments, false, None), settings(true)]), @"Some((DocumentOperation { method: ReplaceDocuments, allow_index_creation: false, primary_key: None, operation_ids: [0] }, false))");

        // batch deletion and addition
-        debug_snapshot!(autobatch_from(false, None, [doc_del(), doc_imp(ReplaceDocuments, true, Some("catto"))]), @"Some((DocumentDeletion { deletion_ids: [0], includes_by_filter: false }, false))");
-        debug_snapshot!(autobatch_from(false, None, [doc_del(), doc_imp(UpdateDocuments, true, Some("catto"))]), @"Some((DocumentDeletion { deletion_ids: [0], includes_by_filter: false }, false))");
-        debug_snapshot!(autobatch_from(false, None, [doc_del(), doc_imp(ReplaceDocuments, true, None)]), @"Some((DocumentDeletion { deletion_ids: [0], includes_by_filter: false }, false))");
-        debug_snapshot!(autobatch_from(false, None, [doc_del(), doc_imp(UpdateDocuments, true, None)]), @"Some((DocumentDeletion { deletion_ids: [0], includes_by_filter: false }, false))");
+        debug_snapshot!(autobatch_from(false, None, [doc_del(), doc_imp(ReplaceDocuments, true, Some("catto"))]), @"Some((DocumentDeletion { deletion_ids: [0] }, false))");
+        debug_snapshot!(autobatch_from(false, None, [doc_del(), doc_imp(UpdateDocuments, true, Some("catto"))]), @"Some((DocumentDeletion { deletion_ids: [0] }, false))");
+        debug_snapshot!(autobatch_from(false, None, [doc_del(), doc_imp(ReplaceDocuments, true, None)]), @"Some((DocumentDeletion { deletion_ids: [0] }, false))");
+        debug_snapshot!(autobatch_from(false, None, [doc_del(), doc_imp(UpdateDocuments, true, None)]), @"Some((DocumentDeletion { deletion_ids: [0] }, false))");
    }

    #[test]
--- a/index-scheduler/src/batch.rs
+++ b/index-scheduler/src/batch.rs
@@ -28,9 +28,6 @@ use meilisearch_types::error::Code;
 use meilisearch_types::heed::{RoTxn, RwTxn};
 use meilisearch_types::milli::documents::{obkv_to_object, DocumentsBatchReader};
 use meilisearch_types::milli::heed::CompactionOption;
-use meilisearch_types::milli::update::new::indexer::{
-    self, retrieve_or_guess_primary_key, DocumentChanges,
-};
 use meilisearch_types::milli::update::{
    IndexDocumentsConfig, IndexDocumentsMethod, IndexerConfig, Settings as MilliSettings,
 };
@@ -113,9 +110,9 @@ pub(crate) enum IndexOperation {
        index_uid: String,
        task: Task,
    },
-    DocumentDeletion {
+    IndexDocumentDeletionByFilter {
        index_uid: String,
-        tasks: Vec<Task>,
+        task: Task,
    },
    DocumentClear {
        index_uid: String,
@@ -168,11 +165,11 @@ impl Batch {
            Batch::IndexOperation { op, .. } => match op {
                IndexOperation::DocumentOperation { tasks, .. }
                | IndexOperation::Settings { tasks, .. }
-                | IndexOperation::DocumentDeletion { tasks, .. }
                | IndexOperation::DocumentClear { tasks, .. } => {
                    RoaringBitmap::from_iter(tasks.iter().map(|task| task.uid))
                }
-                IndexOperation::DocumentEdition { task, .. } => {
+                IndexOperation::DocumentEdition { task, .. }
+                | IndexOperation::IndexDocumentDeletionByFilter { task, .. } => {
                    RoaringBitmap::from_sorted_iter(std::iter::once(task.uid)).unwrap()
                }
                IndexOperation::SettingsAndDocumentOperation {
@@ -237,7 +234,7 @@ impl IndexOperation {
        match self {
            IndexOperation::DocumentOperation { index_uid, .. }
            | IndexOperation::DocumentEdition { index_uid, .. }
-            | IndexOperation::DocumentDeletion { index_uid, .. }
+            | IndexOperation::IndexDocumentDeletionByFilter { index_uid, .. }
            | IndexOperation::DocumentClear { index_uid, .. }
            | IndexOperation::Settings { index_uid, .. }
            | IndexOperation::DocumentClearAndSetting { index_uid, .. }
@@ -255,8 +252,8 @@ impl fmt::Display for IndexOperation {
            IndexOperation::DocumentEdition { .. } => {
                f.write_str("IndexOperation::DocumentEdition")
            }
-            IndexOperation::DocumentDeletion { .. } => {
-                f.write_str("IndexOperation::DocumentDeletion")
+            IndexOperation::IndexDocumentDeletionByFilter { .. } => {
+                f.write_str("IndexOperation::IndexDocumentDeletionByFilter")
            }
            IndexOperation::DocumentClear { .. } => f.write_str("IndexOperation::DocumentClear"),
            IndexOperation::Settings { .. } => f.write_str("IndexOperation::Settings"),
@@ -292,6 +289,21 @@ impl IndexScheduler {
                },
                must_create_index,
            })),
+            BatchKind::DocumentDeletionByFilter { id } => {
+                let task = self.get_task(rtxn, id)?.ok_or(Error::CorruptedTaskQueue)?;
+                match &task.kind {
+                    KindWithContent::DocumentDeletionByFilter { index_uid, .. } => {
+                        Ok(Some(Batch::IndexOperation {
+                            op: IndexOperation::IndexDocumentDeletionByFilter {
+                                index_uid: index_uid.clone(),
+                                task,
+                            },
+                            must_create_index: false,
+                        }))
+                    }
+                    _ => unreachable!(),
+                }
+            }
            BatchKind::DocumentEdition { id } => {
                let task = self.get_task(rtxn, id)?.ok_or(Error::CorruptedTaskQueue)?;
                match &task.kind {
@@ -354,11 +366,30 @@ impl IndexScheduler {
                    must_create_index,
                }))
            }
-            BatchKind::DocumentDeletion { deletion_ids, includes_by_filter: _ } => {
+            BatchKind::DocumentDeletion { deletion_ids } => {
                let tasks = self.get_existing_tasks(rtxn, deletion_ids)?;

+                let mut operations = Vec::with_capacity(tasks.len());
+                let mut documents_counts = Vec::with_capacity(tasks.len());
+                for task in &tasks {
+                    match task.kind {
+                        KindWithContent::DocumentDeletion { ref documents_ids, .. } => {
+                            operations.push(DocumentOperation::Delete(documents_ids.clone()));
+                            documents_counts.push(documents_ids.len() as u64);
+                        }
+                        _ => unreachable!(),
+                    }
+                }
+
                Ok(Some(Batch::IndexOperation {
-                    op: IndexOperation::DocumentDeletion { index_uid, tasks },
+                    op: IndexOperation::DocumentOperation {
+                        index_uid,
+                        primary_key: None,
+                        method: IndexDocumentsMethod::ReplaceDocuments,
+                        documents_counts,
+                        operations,
+                        tasks,
+                    },
                    must_create_index,
                }))
            }
@@ -878,8 +909,10 @@ impl IndexScheduler {
                            while let Some(doc) =
                                cursor.next_document().map_err(milli::Error::from)?
                            {
-                                dump_content_file
-                                    .push_document(&obkv_to_object(doc, &documents_batch_index)?)?;
+                                dump_content_file.push_document(&obkv_to_object(
+                                    &doc,
+                                    &documents_batch_index,
+                                )?)?;
                            }
                            dump_content_file.flush()?;
                        }
@@ -1253,52 +1286,58 @@ impl IndexScheduler {
                let must_stop_processing = self.must_stop_processing.clone();
                let indexer_config = self.index_mapper.indexer_config();

-                /// TODO manage errors correctly
-                let rtxn = index.read_txn()?;
-                let first_addition_uuid = operations
-                    .iter()
-                    .find_map(|op| match op {
-                        DocumentOperation::Add(content_uuid) => Some(content_uuid),
-                        _ => None,
-                    })
-                    .unwrap();
-
-                let mut content_files = Vec::new();
-                for operation in &operations {
-                    if let DocumentOperation::Add(content_uuid) = operation {
-                        let content_file = self.file_store.get_update(*content_uuid)?;
-                        let mmap = unsafe { memmap2::Mmap::map(&content_file)? };
-                        if !mmap.is_empty() {
-                            content_files.push(mmap);
+                if let Some(primary_key) = primary_key {
+                    match index.primary_key(index_wtxn)? {
+                        // if a primary key was set AND had already been defined in the index
+                        // but to a different value, we can make the whole batch fail.
+                        Some(pk) => {
+                            if primary_key != pk {
+                                return Err(milli::Error::from(
+                                    milli::UserError::PrimaryKeyCannotBeChanged(pk.to_string()),
+                                )
+                                .into());
+                            }
+                        }
+                        // if the primary key was set and there was no primary key set for this index
+                        // we set it to the received value before starting the indexing process.
+                        None => {
+                            let mut builder =
+                                milli::update::Settings::new(index_wtxn, index, indexer_config);
+                            builder.set_primary_key(primary_key);
+                            builder.execute(
+                                |indexing_step| tracing::debug!(update = ?indexing_step),
+                                || must_stop_processing.clone().get(),
+                            )?;
+                            primary_key_has_been_set = true;
                        }
                    }
                }

-                let mut fields_ids_map = index.fields_ids_map(&rtxn)?;
-                let first_document = match content_files.first() {
-                    Some(mmap) => {
-                        let mut iter = serde_json::Deserializer::from_slice(mmap).into_iter();
-                        iter.next().transpose().map_err(|e| e.into()).map_err(Error::IoError)?
-                    }
-                    None => None,
-                };
+                let config = IndexDocumentsConfig { update_method: method, ..Default::default() };

-                let primary_key = retrieve_or_guess_primary_key(
-                    &rtxn,
+                let embedder_configs = index.embedding_configs(index_wtxn)?;
+                // TODO: consider Arc'ing the map too (we only need read access + we'll be cloning it multiple times, so really makes sense)
+                let embedders = self.embedders(embedder_configs)?;
+
+                let mut builder = milli::update::IndexDocuments::new(
+                    index_wtxn,
                    index,
-                    &mut fields_ids_map,
-                    first_document.as_ref(),
-                )?
-                .unwrap();
+                    indexer_config,
+                    config,
+                    |indexing_step| tracing::trace!(?indexing_step, "Update"),
+                    || must_stop_processing.get(),
+                )?;

-                let mut content_files_iter = content_files.iter();
-                let mut indexer = indexer::DocumentOperation::new(method);
                for (operation, task) in operations.into_iter().zip(tasks.iter_mut()) {
                    match operation {
-                        DocumentOperation::Add(_content_uuid) => {
-                            let mmap = content_files_iter.next().unwrap();
-                            let stats = indexer.add_documents(mmap)?;
-                            // builder = builder.with_embedders(embedders.clone());
+                        DocumentOperation::Add(content_uuid) => {
+                            let content_file = self.file_store.get_update(content_uuid)?;
+                            let reader = DocumentsBatchReader::from_reader(content_file)
+                                .map_err(milli::Error::from)?;
+                            let (new_builder, user_result) = builder.add_documents(reader)?;
+                            builder = new_builder;
+
+                            builder = builder.with_embedders(embedders.clone());

                            let received_documents =
                                if let Some(Details::DocumentAdditionOrUpdate {
@@ -1312,17 +1351,30 @@ impl IndexScheduler {
                                    unreachable!();
                                };

-                            task.status = Status::Succeeded;
-                            task.details = Some(Details::DocumentAdditionOrUpdate {
-                                received_documents,
-                                indexed_documents: Some(stats.document_count as u64),
-                            })
+                            match user_result {
+                                Ok(count) => {
+                                    task.status = Status::Succeeded;
+                                    task.details = Some(Details::DocumentAdditionOrUpdate {
+                                        received_documents,
+                                        indexed_documents: Some(count),
+                                    })
+                                }
+                                Err(e) => {
+                                    task.status = Status::Failed;
+                                    task.details = Some(Details::DocumentAdditionOrUpdate {
+                                        received_documents,
+                                        indexed_documents: Some(0),
+                                    });
+                                    task.error = Some(milli::Error::from(e).into());
+                                }
+                            }
                        }
                        DocumentOperation::Delete(document_ids) => {
-                            let count = document_ids.len();
-                            indexer.delete_documents(document_ids);
+                            let (new_builder, user_result) =
+                                builder.remove_documents(document_ids)?;
+                            builder = new_builder;
                            // Uses Invariant: remove documents actually always returns Ok for the inner result
-                            // let count = user_result.unwrap();
+                            let count = user_result.unwrap();
                            let provided_ids =
                                if let Some(Details::DocumentDeletion { provided_ids, .. }) =
                                    task.details
@@ -1336,35 +1388,26 @@ impl IndexScheduler {
                            task.status = Status::Succeeded;
                            task.details = Some(Details::DocumentDeletion {
                                provided_ids,
-                                deleted_documents: Some(count as u64),
+                                deleted_documents: Some(count),
                            });
                        }
                    }
                }

                if !tasks.iter().all(|res| res.error.is_some()) {
-                    /// TODO create a pool if needed
-                    // let pool = indexer_config.thread_pool.unwrap();
-                    let pool = rayon::ThreadPoolBuilder::new().build().unwrap();
-
-                    let param = (index, &rtxn, &primary_key);
-                    let document_changes = indexer.document_changes(&mut fields_ids_map, param)?;
-                    /// TODO pass/write the FieldsIdsMap
-                    indexer::index(index_wtxn, index, fields_ids_map, &pool, document_changes)?;
-
-                    // tracing::info!(indexing_result = ?addition, processed_in = ?started_processing_at.elapsed(), "document indexing done");
+                    let addition = builder.execute()?;
+                    tracing::info!(indexing_result = ?addition, processed_in = ?started_processing_at.elapsed(), "document indexing done");
+                } else if primary_key_has_been_set {
+                    // Everything failed but we've set a primary key.
+                    // We need to remove it.
+                    let mut builder =
+                        milli::update::Settings::new(index_wtxn, index, indexer_config);
+                    builder.reset_primary_key();
+                    builder.execute(
+                        |indexing_step| tracing::trace!(update = ?indexing_step),
+                        || must_stop_processing.clone().get(),
+                    )?;
                }
-                // else if primary_key_has_been_set {
-                //     // Everything failed but we've set a primary key.
-                //     // We need to remove it.
-                //     let mut builder =
-                //         milli::update::Settings::new(index_wtxn, index, indexer_config);
-                //     builder.reset_primary_key();
-                //     builder.execute(
-                //         |indexing_step| tracing::trace!(update = ?indexing_step),
-                //         || must_stop_processing.clone().get(),
-                //     )?;
-                // }

                Ok(tasks)
            }
@@ -1396,7 +1439,7 @@ impl IndexScheduler {
                {
                    (original_filter, context, function)
                } else {
-                    // In the case of a `documentEdition` the details MUST be set
+                    // In the case of a `documentDeleteByFilter` the details MUST be set
                    unreachable!();
                };

@@ -1426,102 +1469,52 @@ impl IndexScheduler {

                Ok(vec![task])
            }
-            IndexOperation::DocumentDeletion { mut tasks, index_uid: _ } => {
-                let mut to_delete = RoaringBitmap::new();
-                let external_documents_ids = index.external_documents_ids();
+            IndexOperation::IndexDocumentDeletionByFilter { mut task, index_uid: _ } => {
+                let filter =
+                    if let KindWithContent::DocumentDeletionByFilter { filter_expr, .. } =
+                        &task.kind
+                    {
+                        filter_expr
+                    } else {
+                        unreachable!()
+                    };
+                let deleted_documents = delete_document_by_filter(
+                    index_wtxn,
+                    filter,
+                    self.index_mapper.indexer_config(),
+                    self.must_stop_processing.clone(),
+                    index,
+                );
+                let original_filter = if let Some(Details::DocumentDeletionByFilter {
+                    original_filter,
+                    deleted_documents: _,
+                }) = task.details
+                {
+                    original_filter
+                } else {
+                    // In the case of a `documentDeleteByFilter` the details MUST be set
+                    unreachable!();
+                };

-                for task in tasks.iter_mut() {
-                    let before = to_delete.len();
-                    task.status = Status::Succeeded;
-
-                    match &task.kind {
-                        KindWithContent::DocumentDeletion { index_uid: _, documents_ids } => {
-                            for id in documents_ids {
-                                if let Some(id) = external_documents_ids.get(index_wtxn, id)? {
-                                    to_delete.insert(id);
-                                }
-                            }
-                            let will_be_removed = to_delete.len() - before;
-                            task.details = Some(Details::DocumentDeletion {
-                                provided_ids: documents_ids.len(),
-                                deleted_documents: Some(will_be_removed),
-                            });
-                        }
-                        KindWithContent::DocumentDeletionByFilter { index_uid: _, filter_expr } => {
-                            let before = to_delete.len();
-                            let filter = match Filter::from_json(filter_expr) {
-                                Ok(filter) => filter,
-                                Err(err) => {
-                                    // theorically, this should be catched by deserr before reaching the index-scheduler and cannot happens
-                                    task.status = Status::Failed;
-                                    task.error = match err {
-                                        milli::Error::UserError(
-                                            milli::UserError::InvalidFilterExpression { .. },
-                                        ) => Some(
-                                            Error::from(err)
-                                                .with_custom_error_code(Code::InvalidDocumentFilter)
-                                                .into(),
-                                        ),
-                                        e => Some(e.into()),
-                                    };
-                                    None
-                                }
-                            };
-                            if let Some(filter) = filter {
-                                let candidates =
-                                    filter.evaluate(index_wtxn, index).map_err(|err| match err {
-                                        milli::Error::UserError(
-                                            milli::UserError::InvalidFilter(_),
-                                        ) => Error::from(err)
-                                            .with_custom_error_code(Code::InvalidDocumentFilter),
-                                        e => e.into(),
-                                    });
-                                match candidates {
-                                    Ok(candidates) => to_delete |= candidates,
-                                    Err(err) => {
-                                        task.status = Status::Failed;
-                                        task.error = Some(err.into());
-                                    }
-                                };
-                            }
-                            let will_be_removed = to_delete.len() - before;
-                            if let Some(Details::DocumentDeletionByFilter {
-                                original_filter: _,
-                                deleted_documents,
-                            }) = &mut task.details
-                            {
-                                *deleted_documents = Some(will_be_removed);
-                            } else {
-                                // In the case of a `documentDeleteByFilter` the details MUST be set
-                                unreachable!()
-                            }
-                        }
-                        _ => unreachable!(),
+                match deleted_documents {
+                    Ok(deleted_documents) => {
+                        task.status = Status::Succeeded;
+                        task.details = Some(Details::DocumentDeletionByFilter {
+                            original_filter,
+                            deleted_documents: Some(deleted_documents),
+                        });
+                    }
+                    Err(e) => {
+                        task.status = Status::Failed;
+                        task.details = Some(Details::DocumentDeletionByFilter {
+                            original_filter,
+                            deleted_documents: Some(0),
+                        });
+                        task.error = Some(e.into());
                    }
                }

-                let config = IndexDocumentsConfig {
-                    update_method: IndexDocumentsMethod::ReplaceDocuments,
-                    ..Default::default()
-                };
-
-                let must_stop_processing = self.must_stop_processing.clone();
-                let mut builder = milli::update::IndexDocuments::new(
-                    index_wtxn,
-                    index,
-                    self.index_mapper.indexer_config(),
-                    config,
-                    |indexing_step| tracing::debug!(update = ?indexing_step),
-                    || must_stop_processing.get(),
-                )?;
-
-                let (new_builder, _count) =
-                    builder.remove_documents_from_db_no_batch(&to_delete)?;
-                builder = new_builder;
-
-                let _ = builder.execute()?;
-
-                Ok(tasks)
+                Ok(vec![task])
            }
            IndexOperation::Settings { index_uid: _, settings, mut tasks } => {
                let indexer_config = self.index_mapper.indexer_config();
@@ -1725,6 +1718,46 @@ impl IndexScheduler {
    }
 }

+fn delete_document_by_filter<'a>(
+    wtxn: &mut RwTxn<'a>,
+    filter: &serde_json::Value,
+    indexer_config: &IndexerConfig,
+    must_stop_processing: MustStopProcessing,
+    index: &'a Index,
+) -> Result<u64> {
+    let filter = Filter::from_json(filter)?;
+    Ok(if let Some(filter) = filter {
+        let candidates = filter.evaluate(wtxn, index).map_err(|err| match err {
+            milli::Error::UserError(milli::UserError::InvalidFilter(_)) => {
+                Error::from(err).with_custom_error_code(Code::InvalidDocumentFilter)
+            }
+            e => e.into(),
+        })?;
+
+        let config = IndexDocumentsConfig {
+            update_method: IndexDocumentsMethod::ReplaceDocuments,
+            ..Default::default()
+        };
+
+        let mut builder = milli::update::IndexDocuments::new(
+            wtxn,
+            index,
+            indexer_config,
+            config,
+            |indexing_step| tracing::debug!(update = ?indexing_step),
+            || must_stop_processing.get(),
+        )?;
+
+        let (new_builder, count) = builder.remove_documents_from_db_no_batch(&candidates)?;
+        builder = new_builder;
+
+        let _ = builder.execute()?;
+        count
+    } else {
+        0
+    })
+}
+
 fn edit_documents_by_function<'a>(
    wtxn: &mut RwTxn<'a>,
    filter: &Option<serde_json::Value>,
--- a/index-scheduler/src/features.rs
+++ b/index-scheduler/src/features.rs
@@ -87,7 +87,7 @@ impl RoFeatures {
            Ok(())
        } else {
            Err(FeatureNotEnabledError {
-                disabled_action: "Using `CONTAINS` or `STARTS WITH` in a filter",
+                disabled_action: "Using `CONTAINS` in a filter",
                feature: "contains filter",
                issue_link: "https://github.com/orgs/meilisearch/discussions/763",
            }
--- a/index-scheduler/src/index_mapper/mod.rs
+++ b/index-scheduler/src/index_mapper/mod.rs
@@ -108,10 +108,8 @@ pub struct IndexStats {
    /// Association of every field name with the number of times it occurs in the documents.
    pub field_distribution: FieldDistribution,
    /// Creation date of the index.
-    #[serde(with = "time::serde::rfc3339")]
    pub created_at: OffsetDateTime,
    /// Date of the last update of the index.
-    #[serde(with = "time::serde::rfc3339")]
    pub updated_at: OffsetDateTime,
 }

--- a/index-scheduler/src/insta_snapshot.rs
+++ b/index-scheduler/src/insta_snapshot.rs
@@ -11,9 +11,6 @@ use crate::index_mapper::IndexMapper;
 use crate::{IndexScheduler, Kind, Status, BEI128};

 pub fn snapshot_index_scheduler(scheduler: &IndexScheduler) -> String {
-    // Since we'll snapshot the index right afterward, we don't need to ensure it's internally consistent for every run.
-    // We can only do it for the release run, where the function runs way faster.
-    #[cfg(not(debug_assertions))]
    scheduler.assert_internally_consistent();

    let IndexScheduler {
--- a/index-scheduler/src/lib.rs
+++ b/index-scheduler/src/lib.rs
@@ -35,7 +35,6 @@ pub type TaskId = u32;
 use std::collections::{BTreeMap, HashMap};
 use std::io::{self, BufReader, Read};
 use std::ops::{Bound, RangeBounds};
-use std::panic::{catch_unwind, AssertUnwindSafe};
 use std::path::{Path, PathBuf};
 use std::sync::atomic::Ordering::{self, Relaxed};
 use std::sync::atomic::{AtomicBool, AtomicU32};
@@ -613,24 +612,19 @@ impl IndexScheduler {
                #[cfg(test)]
                run.breakpoint(Breakpoint::Init);

-                run.wake_up.wait_timeout(std::time::Duration::from_secs(60));
+                run.wake_up.wait();

                loop {
-                    let ret = catch_unwind(AssertUnwindSafe(|| run.tick()));
-                    match ret {
-                        Ok(Ok(TickOutcome::TickAgain(_))) => (),
-                        Ok(Ok(TickOutcome::WaitForSignal)) => run.wake_up.wait(),
-                        Ok(Err(e)) => {
+                    match run.tick() {
+                        Ok(TickOutcome::TickAgain(_)) => (),
+                        Ok(TickOutcome::WaitForSignal) => run.wake_up.wait(),
+                        Err(e) => {
                            tracing::error!("{e}");
                            // Wait one second when an irrecoverable error occurs.
                            if !e.is_recoverable() {
                                std::thread::sleep(Duration::from_secs(1));
                            }
                        }
-                        Err(_panic) => {
-                            tracing::error!("Internal error: Unexpected panic in the `IndexScheduler::run` method.");
-
-                        }
                    }
                }
            })
@@ -1477,7 +1471,7 @@ impl IndexScheduler {
            .map(
                |IndexEmbeddingConfig {
                     name,
-                     config: milli::vector::EmbeddingConfig { embedder_options, prompt, quantized },
+                     config: milli::vector::EmbeddingConfig { embedder_options, prompt },
                     ..
                 }| {
                    let prompt =
@@ -1486,10 +1480,7 @@ impl IndexScheduler {
                    {
                        let embedders = self.embedders.read().unwrap();
                        if let Some(embedder) = embedders.get(&embedder_options) {
-                            return Ok((
-                                name,
-                                (embedder.clone(), prompt, quantized.unwrap_or_default()),
-                            ));
+                            return Ok((name, (embedder.clone(), prompt)));
                        }
                    }

@@ -1503,7 +1494,7 @@ impl IndexScheduler {
                        let mut embedders = self.embedders.write().unwrap();
                        embedders.insert(embedder_options, embedder.clone());
                    }
-                    Ok((name, (embedder, prompt, quantized.unwrap_or_default())))
+                    Ok((name, (embedder, prompt)))
                },
            )
            .collect();
@@ -1767,7 +1758,6 @@ mod tests {
    use crossbeam::channel::RecvTimeoutError;
    use file_store::File;
    use insta::assert_json_snapshot;
-    use maplit::btreeset;
    use meili_snap::{json_string, snapshot};
    use meilisearch_auth::AuthFilter;
    use meilisearch_types::document_formats::DocumentFormatError;
@@ -2010,13 +2000,11 @@ mod tests {
        fn advance_till(&mut self, breakpoints: impl IntoIterator<Item = Breakpoint>) {
            for breakpoint in breakpoints {
                let b = self.advance();
+                let state = snapshot_index_scheduler(&self.index_scheduler);
                assert_eq!(
-                    b,
-                    breakpoint,
-                    "Was expecting the breakpoint `{:?}` but instead got `{:?}`.\n{}",
-                    breakpoint,
-                    b,
-                    snapshot_index_scheduler(&self.index_scheduler)
+                    b, breakpoint,
+                    "Was expecting the breakpoint `{:?}` but instead got `{:?}`.\n{state}",
+                    breakpoint, b
                );
            }
        }
@@ -2040,6 +2028,7 @@ mod tests {
        // Wait for one successful batch.
        #[track_caller]
        fn advance_one_successful_batch(&mut self) {
+            self.index_scheduler.assert_internally_consistent();
            self.advance_till([Start, BatchCreated]);
            loop {
                match self.advance() {
@@ -2058,6 +2047,7 @@ mod tests {
            }

            self.advance_till([AfterProcessing]);
+            self.index_scheduler.assert_internally_consistent();
        }

        // Wait for one failed batch.
@@ -2557,117 +2547,6 @@ mod tests {
        snapshot!(serde_json::to_string_pretty(&documents).unwrap(), name: "documents");
    }

-    #[test]
-    fn fail_in_process_batch_for_document_deletion() {
-        let (index_scheduler, mut handle) = IndexScheduler::test(true, vec![]);
-
-        use meilisearch_types::settings::{Settings, Unchecked};
-        let mut new_settings: Box<Settings<Unchecked>> = Box::default();
-        new_settings.filterable_attributes = Setting::Set(btreeset!(S("catto")));
-
-        index_scheduler
-            .register(
-                KindWithContent::SettingsUpdate {
-                    index_uid: S("doggos"),
-                    new_settings,
-                    is_deletion: false,
-                    allow_index_creation: true,
-                },
-                None,
-                false,
-            )
-            .unwrap();
-
-        let content = r#"[
-            { "id": 1, "doggo": "jean bob" },
-            { "id": 2, "catto": "jorts" },
-            { "id": 3, "doggo": "bork" }
-        ]"#;
-
-        let (uuid, mut file) = index_scheduler.create_update_file_with_uuid(0).unwrap();
-        let documents_count = read_json(content.as_bytes(), &mut file).unwrap();
-        file.persist().unwrap();
-        index_scheduler
-            .register(
-                KindWithContent::DocumentAdditionOrUpdate {
-                    index_uid: S("doggos"),
-                    primary_key: Some(S("id")),
-                    method: ReplaceDocuments,
-                    content_file: uuid,
-                    documents_count,
-                    allow_index_creation: true,
-                },
-                None,
-                false,
-            )
-            .unwrap();
-        snapshot!(snapshot_index_scheduler(&index_scheduler), name: "registered_the_setting_and_document_addition");
-
-        handle.advance_one_successful_batch();
-        snapshot!(snapshot_index_scheduler(&index_scheduler), name: "after_adding_the_settings");
-        handle.advance_one_successful_batch();
-        snapshot!(snapshot_index_scheduler(&index_scheduler), name: "after_adding_the_documents");
-
-        index_scheduler
-            .register(
-                KindWithContent::DocumentDeletion {
-                    index_uid: S("doggos"),
-                    documents_ids: vec![S("1")],
-                },
-                None,
-                false,
-            )
-            .unwrap();
-        // This one should not be catched by Meilisearch but it's still nice to handle it because if one day we break the filters it could happens
-        index_scheduler
-            .register(
-                KindWithContent::DocumentDeletionByFilter {
-                    index_uid: S("doggos"),
-                    filter_expr: serde_json::json!(true),
-                },
-                None,
-                false,
-            )
-            .unwrap();
-        // Should fail because the ids are not filterable
-        index_scheduler
-            .register(
-                KindWithContent::DocumentDeletionByFilter {
-                    index_uid: S("doggos"),
-                    filter_expr: serde_json::json!("id = 2"),
-                },
-                None,
-                false,
-            )
-            .unwrap();
-        index_scheduler
-            .register(
-                KindWithContent::DocumentDeletionByFilter {
-                    index_uid: S("doggos"),
-                    filter_expr: serde_json::json!("catto EXISTS"),
-                },
-                None,
-                false,
-            )
-            .unwrap();
-        snapshot!(snapshot_index_scheduler(&index_scheduler), name: "registered_the_document_deletions");
-
-        // Everything should be batched together
-        handle.advance_one_successful_batch();
-        snapshot!(snapshot_index_scheduler(&index_scheduler), name: "after_removing_the_documents");
-
-        let index = index_scheduler.index("doggos").unwrap();
-        let rtxn = index.read_txn().unwrap();
-        let field_ids_map = index.fields_ids_map(&rtxn).unwrap();
-        let field_ids = field_ids_map.ids().collect::<Vec<_>>();
-        let documents = index
-            .all_documents(&rtxn)
-            .unwrap()
-            .map(|ret| obkv_to_json(&field_ids, &field_ids_map, ret.unwrap().1).unwrap())
-            .collect::<Vec<_>>();
-        snapshot!(serde_json::to_string_pretty(&documents).unwrap(), name: "documents_remaining_should_only_be_bork");
-    }
-
    #[test]
    fn do_not_batch_task_of_different_indexes() {
        let (index_scheduler, mut handle) = IndexScheduler::test(true, vec![]);
@@ -3168,8 +3047,6 @@ mod tests {
            api_key: Setting::Set(S("My super secret")),
            url: Setting::Set(S("http://localhost:7777")),
            dimensions: Setting::Set(4),
-            request: Setting::Set(serde_json::json!("{{text}}")),
-            response: Setting::Set(serde_json::json!("{{embedding}}")),
            ..Default::default()
        };
        embedders.insert(S("default"), Setting::Set(embedding_settings));
@@ -5129,8 +5006,6 @@ mod tests {
            api_key: Setting::Set(S("My super secret")),
            url: Setting::Set(S("http://localhost:7777")),
            dimensions: Setting::Set(384),
-            request: Setting::Set(serde_json::json!("{{text}}")),
-            response: Setting::Set(serde_json::json!("{{embedding}}")),
            ..Default::default()
        };
        embedders.insert(S("A_fakerest"), Setting::Set(embedding_settings));
@@ -5200,7 +5075,7 @@ mod tests {
            let simple_hf_name = name.clone();

            let configs = index_scheduler.embedders(configs).unwrap();
-            let (hf_embedder, _, _) = configs.get(&simple_hf_name).unwrap();
+            let (hf_embedder, _) = configs.get(&simple_hf_name).unwrap();
            let beagle_embed = hf_embedder.embed_one(S("Intel the beagle best doggo")).unwrap();
            let lab_embed = hf_embedder.embed_one(S("Max the lab best doggo")).unwrap();
            let patou_embed = hf_embedder.embed_one(S("kefir the patou best doggo")).unwrap();
@@ -5518,11 +5393,7 @@ mod tests {
                    ),
                    prompt: PromptData {
                        template: "{{doc.doggo}}",
-                        max_bytes: Some(
-                            400,
-                        ),
                    },
-                    quantized: None,
                },
                user_provided: RoaringBitmap<[1, 2]>,
            },
@@ -5535,8 +5406,28 @@ mod tests {

        // the document with the id 3 should keep its original embedding
        let docid = index.external_documents_ids.get(&rtxn, "3").unwrap().unwrap();
-        let embeddings = index.embeddings(&rtxn, docid).unwrap();
-        let embeddings = &embeddings["my_doggo_embedder"];
+        let mut embeddings = Vec::new();
+
+        'vectors: for i in 0..=u8::MAX {
+            let reader = arroy::Reader::open(&rtxn, i as u16, index.vector_arroy)
+                .map(Some)
+                .or_else(|e| match e {
+                    arroy::Error::MissingMetadata(_) => Ok(None),
+                    e => Err(e),
+                })
+                .transpose();
+
+            let Some(reader) = reader else {
+                break 'vectors;
+            };
+
+            let embedding = reader.unwrap().item_vector(&rtxn, docid).unwrap();
+            if let Some(embedding) = embedding {
+                embeddings.push(embedding)
+            } else {
+                break 'vectors;
+            }
+        }

        snapshot!(embeddings.len(), @"1");
        assert!(embeddings[0].iter().all(|i| *i == 3.0), "{:?}", embeddings[0]);
@@ -5716,12 +5607,8 @@ mod tests {
                        },
                    ),
                    prompt: PromptData {
-                        template: "{% for field in fields %}{% if field.is_searchable and field.value != nil %}{{ field.name }}: {{ field.value }}\n{% endif %}{% endfor %}",
-                        max_bytes: Some(
-                            400,
-                        ),
+                        template: "{% for field in fields %} {{ field.name }}: {{ field.value }}\n{% endfor %}",
                    },
-                    quantized: None,
                },
                user_provided: RoaringBitmap<[0]>,
            },
@@ -5760,12 +5647,8 @@ mod tests {
                        },
                    ),
                    prompt: PromptData {
-                        template: "{% for field in fields %}{% if field.is_searchable and field.value != nil %}{{ field.name }}: {{ field.value }}\n{% endif %}{% endfor %}",
-                        max_bytes: Some(
-                            400,
-                        ),
+                        template: "{% for field in fields %} {{ field.name }}: {{ field.value }}\n{% endfor %}",
                    },
-                    quantized: None,
                },
                user_provided: RoaringBitmap<[]>,
            },
--- a/index-scheduler/src/snapshots/index_schedulertestsimport_vectors-2.snap
+++ b/index-scheduler/src/snapshots/index_schedulertestsimport_vectors-2.snap
@@ -8,9 +8,7 @@ expression: task.details
      "source": "rest",
      "apiKey": "MyXXXX...",
      "dimensions": 384,
-      "url": "http://localhost:7777",
-      "request": "{{text}}",
-      "response": "{{embedding}}"
+      "url": "http://localhost:7777"
    },
    "B_small_hf": {
      "source": "huggingFace",
--- a/index-scheduler/src/snapshots/index_schedulertestsimport_vectors-5.snap
+++ b/index-scheduler/src/snapshots/index_schedulertestsimport_vectors-5.snap
@@ -8,8 +8,16 @@ expression: fakerest_config.embedder_options
    "distribution": null,
    "dimensions": 384,
    "url": "http://localhost:7777",
-    "request": "{{text}}",
-    "response": "{{embedding}}",
-    "headers": {}
+    "query": null,
+    "input_field": [
+      "input"
+    ],
+    "path_to_embeddings": [
+      "data"
+    ],
+    "embedding_object": [
+      "embedding"
+    ],
+    "input_type": "text"
  }
 }
--- a/index-scheduler/src/snapshots/index_schedulertestsimport_vectors.snap
+++ b/index-scheduler/src/snapshots/index_schedulertestsimport_vectors.snap
@@ -8,9 +8,7 @@ expression: task.details
      "source": "rest",
      "apiKey": "MyXXXX...",
      "dimensions": 384,
-      "url": "http://localhost:7777",
-      "request": "{{text}}",
-      "response": "{{embedding}}"
+      "url": "http://localhost:7777"
    },
    "B_small_hf": {
      "source": "huggingFace",
--- a/index-scheduler/src/snapshots/index_schedulertestssettings_update-2.snap
+++ b/index-scheduler/src/snapshots/index_schedulertestssettings_update-2.snap
@@ -8,9 +8,7 @@ expression: task.details
      "source": "rest",
      "apiKey": "MyXXXX...",
      "dimensions": 4,
-      "url": "http://localhost:7777",
-      "request": "{{text}}",
-      "response": "{{embedding}}"
+      "url": "http://localhost:7777"
    }
  }
 }
--- a/index-scheduler/src/snapshots/index_schedulertestssettings_update-5.snap
+++ b/index-scheduler/src/snapshots/index_schedulertestssettings_update-5.snap
@@ -1,6 +1,6 @@
 ---
 source: index-scheduler/src/lib.rs
-expression: config.embedder_options
+expression: embedding_config.embedder_options
 ---
 {
  "Rest": {
@@ -8,8 +8,16 @@ expression: config.embedder_options
    "distribution": null,
    "dimensions": 4,
    "url": "http://localhost:7777",
-    "request": "{{text}}",
-    "response": "{{embedding}}",
-    "headers": {}
+    "query": null,
+    "input_field": [
+      "input"
+    ],
+    "path_to_embeddings": [
+      "data"
+    ],
+    "embedding_object": [
+      "embedding"
+    ],
+    "input_type": "text"
  }
 }
--- a/index-scheduler/src/snapshots/index_schedulertestssettings_update.snap
+++ b/index-scheduler/src/snapshots/index_schedulertestssettings_update.snap
@@ -8,9 +8,7 @@ expression: task.details
      "source": "rest",
      "apiKey": "MyXXXX...",
      "dimensions": 4,
-      "url": "http://localhost:7777",
-      "request": "{{text}}",
-      "response": "{{embedding}}"
+      "url": "http://localhost:7777"
    }
  }
 }
--- a/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_deletion/after_adding_the_documents.snap
+++ b/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_deletion/after_adding_the_documents.snap
@@ -1,44 +0,0 @@
---
-source: index-scheduler/src/lib.rs
---
-### Autobatching Enabled = true
-### Processing Tasks:
-[]
----------------------------------------------------------------------
-### All Tasks:
-0 {uid: 0, status: succeeded, details: { settings: Settings { displayed_attributes: WildcardSetting(NotSet), searchable_attributes: WildcardSetting(NotSet), filterable_attributes: Set({"catto"}), sortable_attributes: NotSet, ranking_rules: NotSet, stop_words: NotSet, non_separator_tokens: NotSet, separator_tokens: NotSet, dictionary: NotSet, synonyms: NotSet, distinct_attribute: NotSet, proximity_precision: NotSet, typo_tolerance: NotSet, faceting: NotSet, pagination: NotSet, embedders: NotSet, search_cutoff_ms: NotSet, localized_attributes: NotSet, _kind: PhantomData<meilisearch_types::settings::Unchecked> } }, kind: SettingsUpdate { index_uid: "doggos", new_settings: Settings { displayed_attributes: WildcardSetting(NotSet), searchable_attributes: WildcardSetting(NotSet), filterable_attributes: Set({"catto"}), sortable_attributes: NotSet, ranking_rules: NotSet, stop_words: NotSet, non_separator_tokens: NotSet, separator_tokens: NotSet, dictionary: NotSet, synonyms: NotSet, distinct_attribute: NotSet, proximity_precision: NotSet, typo_tolerance: NotSet, faceting: NotSet, pagination: NotSet, embedders: NotSet, search_cutoff_ms: NotSet, localized_attributes: NotSet, _kind: PhantomData<meilisearch_types::settings::Unchecked> }, is_deletion: false, allow_index_creation: true }}
-1 {uid: 1, status: succeeded, details: { received_documents: 3, indexed_documents: Some(3) }, kind: DocumentAdditionOrUpdate { index_uid: "doggos", primary_key: Some("id"), method: ReplaceDocuments, content_file: 00000000-0000-0000-0000-000000000000, documents_count: 3, allow_index_creation: true }}
----------------------------------------------------------------------
-### Status:
-enqueued []
-succeeded [0,1,]
----------------------------------------------------------------------
-### Kind:
-"documentAdditionOrUpdate" [1,]
-"settingsUpdate" [0,]
----------------------------------------------------------------------
-### Index Tasks:
-doggos [0,1,]
----------------------------------------------------------------------
-### Index Mapper:
-doggos: { number_of_documents: 3, field_distribution: {"catto": 1, "doggo": 2, "id": 3} }
-
----------------------------------------------------------------------
-### Canceled By:
-
----------------------------------------------------------------------
-### Enqueued At:
-[timestamp] [0,]
-[timestamp] [1,]
----------------------------------------------------------------------
-### Started At:
-[timestamp] [0,]
-[timestamp] [1,]
----------------------------------------------------------------------
-### Finished At:
-[timestamp] [0,]
-[timestamp] [1,]
----------------------------------------------------------------------
-### File Store:
-
----------------------------------------------------------------------
--- a/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_deletion/after_adding_the_settings.snap
+++ b/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_deletion/after_adding_the_settings.snap
@@ -1,43 +0,0 @@
---
-source: index-scheduler/src/lib.rs
---
-### Autobatching Enabled = true
-### Processing Tasks:
-[]
----------------------------------------------------------------------
-### All Tasks:
-0 {uid: 0, status: succeeded, details: { settings: Settings { displayed_attributes: WildcardSetting(NotSet), searchable_attributes: WildcardSetting(NotSet), filterable_attributes: Set({"catto"}), sortable_attributes: NotSet, ranking_rules: NotSet, stop_words: NotSet, non_separator_tokens: NotSet, separator_tokens: NotSet, dictionary: NotSet, synonyms: NotSet, distinct_attribute: NotSet, proximity_precision: NotSet, typo_tolerance: NotSet, faceting: NotSet, pagination: NotSet, embedders: NotSet, search_cutoff_ms: NotSet, localized_attributes: NotSet, _kind: PhantomData<meilisearch_types::settings::Unchecked> } }, kind: SettingsUpdate { index_uid: "doggos", new_settings: Settings { displayed_attributes: WildcardSetting(NotSet), searchable_attributes: WildcardSetting(NotSet), filterable_attributes: Set({"catto"}), sortable_attributes: NotSet, ranking_rules: NotSet, stop_words: NotSet, non_separator_tokens: NotSet, separator_tokens: NotSet, dictionary: NotSet, synonyms: NotSet, distinct_attribute: NotSet, proximity_precision: NotSet, typo_tolerance: NotSet, faceting: NotSet, pagination: NotSet, embedders: NotSet, search_cutoff_ms: NotSet, localized_attributes: NotSet, _kind: PhantomData<meilisearch_types::settings::Unchecked> }, is_deletion: false, allow_index_creation: true }}
-1 {uid: 1, status: enqueued, details: { received_documents: 3, indexed_documents: None }, kind: DocumentAdditionOrUpdate { index_uid: "doggos", primary_key: Some("id"), method: ReplaceDocuments, content_file: 00000000-0000-0000-0000-000000000000, documents_count: 3, allow_index_creation: true }}
----------------------------------------------------------------------
-### Status:
-enqueued [1,]
-succeeded [0,]
----------------------------------------------------------------------
-### Kind:
-"documentAdditionOrUpdate" [1,]
-"settingsUpdate" [0,]
----------------------------------------------------------------------
-### Index Tasks:
-doggos [0,1,]
----------------------------------------------------------------------
-### Index Mapper:
-doggos: { number_of_documents: 0, field_distribution: {} }
-
----------------------------------------------------------------------
-### Canceled By:
-
----------------------------------------------------------------------
-### Enqueued At:
-[timestamp] [0,]
-[timestamp] [1,]
----------------------------------------------------------------------
-### Started At:
-[timestamp] [0,]
----------------------------------------------------------------------
-### Finished At:
-[timestamp] [0,]
----------------------------------------------------------------------
-### File Store:
-00000000-0000-0000-0000-000000000000
-
----------------------------------------------------------------------
--- a/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_deletion/after_adding_the_settings_and_documents.snap
+++ b/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_deletion/after_adding_the_settings_and_documents.snap
@@ -1,43 +0,0 @@
---
-source: index-scheduler/src/lib.rs
---
-### Autobatching Enabled = true
-### Processing Tasks:
-[]
----------------------------------------------------------------------
-### All Tasks:
-0 {uid: 0, status: succeeded, details: { settings: Settings { displayed_attributes: WildcardSetting(NotSet), searchable_attributes: WildcardSetting(NotSet), filterable_attributes: Set({"catto"}), sortable_attributes: NotSet, ranking_rules: NotSet, stop_words: NotSet, non_separator_tokens: NotSet, separator_tokens: NotSet, dictionary: NotSet, synonyms: NotSet, distinct_attribute: NotSet, proximity_precision: NotSet, typo_tolerance: NotSet, faceting: NotSet, pagination: NotSet, embedders: NotSet, search_cutoff_ms: NotSet, localized_attributes: NotSet, _kind: PhantomData<meilisearch_types::settings::Unchecked> } }, kind: SettingsUpdate { index_uid: "doggos", new_settings: Settings { displayed_attributes: WildcardSetting(NotSet), searchable_attributes: WildcardSetting(NotSet), filterable_attributes: Set({"catto"}), sortable_attributes: NotSet, ranking_rules: NotSet, stop_words: NotSet, non_separator_tokens: NotSet, separator_tokens: NotSet, dictionary: NotSet, synonyms: NotSet, distinct_attribute: NotSet, proximity_precision: NotSet, typo_tolerance: NotSet, faceting: NotSet, pagination: NotSet, embedders: NotSet, search_cutoff_ms: NotSet, localized_attributes: NotSet, _kind: PhantomData<meilisearch_types::settings::Unchecked> }, is_deletion: false, allow_index_creation: true }}
-1 {uid: 1, status: enqueued, details: { received_documents: 3, indexed_documents: None }, kind: DocumentAdditionOrUpdate { index_uid: "doggos", primary_key: Some("id"), method: ReplaceDocuments, content_file: 00000000-0000-0000-0000-000000000000, documents_count: 3, allow_index_creation: true }}
----------------------------------------------------------------------
-### Status:
-enqueued [1,]
-succeeded [0,]
----------------------------------------------------------------------
-### Kind:
-"documentAdditionOrUpdate" [1,]
-"settingsUpdate" [0,]
----------------------------------------------------------------------
-### Index Tasks:
-doggos [0,1,]
----------------------------------------------------------------------
-### Index Mapper:
-doggos: { number_of_documents: 0, field_distribution: {} }
-
----------------------------------------------------------------------
-### Canceled By:
-
----------------------------------------------------------------------
-### Enqueued At:
-[timestamp] [0,]
-[timestamp] [1,]
----------------------------------------------------------------------
-### Started At:
-[timestamp] [0,]
----------------------------------------------------------------------
-### Finished At:
-[timestamp] [0,]
----------------------------------------------------------------------
-### File Store:
-00000000-0000-0000-0000-000000000000
-
----------------------------------------------------------------------
--- a/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_deletion/after_removing_the_documents.snap
+++ b/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_deletion/after_removing_the_documents.snap
@@ -1,56 +0,0 @@
---
-source: index-scheduler/src/lib.rs
---
-### Autobatching Enabled = true
-### Processing Tasks:
-[]
----------------------------------------------------------------------
-### All Tasks:
-0 {uid: 0, status: succeeded, details: { settings: Settings { displayed_attributes: WildcardSetting(NotSet), searchable_attributes: WildcardSetting(NotSet), filterable_attributes: Set({"catto"}), sortable_attributes: NotSet, ranking_rules: NotSet, stop_words: NotSet, non_separator_tokens: NotSet, separator_tokens: NotSet, dictionary: NotSet, synonyms: NotSet, distinct_attribute: NotSet, proximity_precision: NotSet, typo_tolerance: NotSet, faceting: NotSet, pagination: NotSet, embedders: NotSet, search_cutoff_ms: NotSet, localized_attributes: NotSet, _kind: PhantomData<meilisearch_types::settings::Unchecked> } }, kind: SettingsUpdate { index_uid: "doggos", new_settings: Settings { displayed_attributes: WildcardSetting(NotSet), searchable_attributes: WildcardSetting(NotSet), filterable_attributes: Set({"catto"}), sortable_attributes: NotSet, ranking_rules: NotSet, stop_words: NotSet, non_separator_tokens: NotSet, separator_tokens: NotSet, dictionary: NotSet, synonyms: NotSet, distinct_attribute: NotSet, proximity_precision: NotSet, typo_tolerance: NotSet, faceting: NotSet, pagination: NotSet, embedders: NotSet, search_cutoff_ms: NotSet, localized_attributes: NotSet, _kind: PhantomData<meilisearch_types::settings::Unchecked> }, is_deletion: false, allow_index_creation: true }}
-1 {uid: 1, status: succeeded, details: { received_documents: 3, indexed_documents: Some(3) }, kind: DocumentAdditionOrUpdate { index_uid: "doggos", primary_key: Some("id"), method: ReplaceDocuments, content_file: 00000000-0000-0000-0000-000000000000, documents_count: 3, allow_index_creation: true }}
-2 {uid: 2, status: succeeded, details: { received_document_ids: 1, deleted_documents: Some(1) }, kind: DocumentDeletion { index_uid: "doggos", documents_ids: ["1"] }}
-3 {uid: 3, status: failed, error: ResponseError { code: 200, message: "Invalid type for filter subexpression: expected: String, Array, found: true.", error_code: "invalid_document_filter", error_type: "invalid_request", error_link: "https://docs.meilisearch.com/errors#invalid_document_filter" }, details: { original_filter: true, deleted_documents: Some(0) }, kind: DocumentDeletionByFilter { index_uid: "doggos", filter_expr: Bool(true) }}
-4 {uid: 4, status: failed, error: ResponseError { code: 200, message: "Attribute `id` is not filterable. Available filterable attributes are: `catto`.\n1:3 id = 2", error_code: "invalid_document_filter", error_type: "invalid_request", error_link: "https://docs.meilisearch.com/errors#invalid_document_filter" }, details: { original_filter: "id = 2", deleted_documents: Some(0) }, kind: DocumentDeletionByFilter { index_uid: "doggos", filter_expr: String("id = 2") }}
-5 {uid: 5, status: succeeded, details: { original_filter: "catto EXISTS", deleted_documents: Some(1) }, kind: DocumentDeletionByFilter { index_uid: "doggos", filter_expr: String("catto EXISTS") }}
----------------------------------------------------------------------
-### Status:
-enqueued []
-succeeded [0,1,2,5,]
-failed [3,4,]
----------------------------------------------------------------------
-### Kind:
-"documentAdditionOrUpdate" [1,]
-"documentDeletion" [2,3,4,5,]
-"settingsUpdate" [0,]
----------------------------------------------------------------------
-### Index Tasks:
-doggos [0,1,2,3,4,5,]
----------------------------------------------------------------------
-### Index Mapper:
-doggos: { number_of_documents: 1, field_distribution: {"doggo": 1, "id": 1} }
-
----------------------------------------------------------------------
-### Canceled By:
-
----------------------------------------------------------------------
-### Enqueued At:
-[timestamp] [0,]
-[timestamp] [1,]
-[timestamp] [2,]
-[timestamp] [3,]
-[timestamp] [4,]
-[timestamp] [5,]
----------------------------------------------------------------------
-### Started At:
-[timestamp] [0,]
-[timestamp] [1,]
-[timestamp] [2,3,4,5,]
----------------------------------------------------------------------
-### Finished At:
-[timestamp] [0,]
-[timestamp] [1,]
-[timestamp] [2,3,4,5,]
----------------------------------------------------------------------
-### File Store:
-
----------------------------------------------------------------------
--- a/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_deletion/documents_remaining_should_only_be_bork.snap
+++ b/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_deletion/documents_remaining_should_only_be_bork.snap
@@ -1,9 +0,0 @@
---
-source: index-scheduler/src/lib.rs
---
-[
-  {
-    "id": 3,
-    "doggo": "bork"
-  }
-]
--- a/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_deletion/registered_the_document_deletions.snap
+++ b/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_deletion/registered_the_document_deletions.snap
@@ -1,53 +0,0 @@
---
-source: index-scheduler/src/lib.rs
---
-### Autobatching Enabled = true
-### Processing Tasks:
-[]
----------------------------------------------------------------------
-### All Tasks:
-0 {uid: 0, status: succeeded, details: { settings: Settings { displayed_attributes: WildcardSetting(NotSet), searchable_attributes: WildcardSetting(NotSet), filterable_attributes: Set({"catto"}), sortable_attributes: NotSet, ranking_rules: NotSet, stop_words: NotSet, non_separator_tokens: NotSet, separator_tokens: NotSet, dictionary: NotSet, synonyms: NotSet, distinct_attribute: NotSet, proximity_precision: NotSet, typo_tolerance: NotSet, faceting: NotSet, pagination: NotSet, embedders: NotSet, search_cutoff_ms: NotSet, localized_attributes: NotSet, _kind: PhantomData<meilisearch_types::settings::Unchecked> } }, kind: SettingsUpdate { index_uid: "doggos", new_settings: Settings { displayed_attributes: WildcardSetting(NotSet), searchable_attributes: WildcardSetting(NotSet), filterable_attributes: Set({"catto"}), sortable_attributes: NotSet, ranking_rules: NotSet, stop_words: NotSet, non_separator_tokens: NotSet, separator_tokens: NotSet, dictionary: NotSet, synonyms: NotSet, distinct_attribute: NotSet, proximity_precision: NotSet, typo_tolerance: NotSet, faceting: NotSet, pagination: NotSet, embedders: NotSet, search_cutoff_ms: NotSet, localized_attributes: NotSet, _kind: PhantomData<meilisearch_types::settings::Unchecked> }, is_deletion: false, allow_index_creation: true }}
-1 {uid: 1, status: succeeded, details: { received_documents: 3, indexed_documents: Some(3) }, kind: DocumentAdditionOrUpdate { index_uid: "doggos", primary_key: Some("id"), method: ReplaceDocuments, content_file: 00000000-0000-0000-0000-000000000000, documents_count: 3, allow_index_creation: true }}
-2 {uid: 2, status: enqueued, details: { received_document_ids: 1, deleted_documents: None }, kind: DocumentDeletion { index_uid: "doggos", documents_ids: ["1"] }}
-3 {uid: 3, status: enqueued, details: { original_filter: true, deleted_documents: None }, kind: DocumentDeletionByFilter { index_uid: "doggos", filter_expr: Bool(true) }}
-4 {uid: 4, status: enqueued, details: { original_filter: "id = 2", deleted_documents: None }, kind: DocumentDeletionByFilter { index_uid: "doggos", filter_expr: String("id = 2") }}
-5 {uid: 5, status: enqueued, details: { original_filter: "catto EXISTS", deleted_documents: None }, kind: DocumentDeletionByFilter { index_uid: "doggos", filter_expr: String("catto EXISTS") }}
----------------------------------------------------------------------
-### Status:
-enqueued [2,3,4,5,]
-succeeded [0,1,]
----------------------------------------------------------------------
-### Kind:
-"documentAdditionOrUpdate" [1,]
-"documentDeletion" [2,3,4,5,]
-"settingsUpdate" [0,]
----------------------------------------------------------------------
-### Index Tasks:
-doggos [0,1,2,3,4,5,]
----------------------------------------------------------------------
-### Index Mapper:
-doggos: { number_of_documents: 3, field_distribution: {"catto": 1, "doggo": 2, "id": 3} }
-
----------------------------------------------------------------------
-### Canceled By:
-
----------------------------------------------------------------------
-### Enqueued At:
-[timestamp] [0,]
-[timestamp] [1,]
-[timestamp] [2,]
-[timestamp] [3,]
-[timestamp] [4,]
-[timestamp] [5,]
----------------------------------------------------------------------
-### Started At:
-[timestamp] [0,]
-[timestamp] [1,]
----------------------------------------------------------------------
-### Finished At:
-[timestamp] [0,]
-[timestamp] [1,]
----------------------------------------------------------------------
-### File Store:
-
----------------------------------------------------------------------
--- a/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_deletion/registered_the_setting_and_document_addition.snap
+++ b/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_deletion/registered_the_setting_and_document_addition.snap
@@ -1,39 +0,0 @@
---
-source: index-scheduler/src/lib.rs
---
-### Autobatching Enabled = true
-### Processing Tasks:
-[]
----------------------------------------------------------------------
-### All Tasks:
-0 {uid: 0, status: enqueued, details: { settings: Settings { displayed_attributes: WildcardSetting(NotSet), searchable_attributes: WildcardSetting(NotSet), filterable_attributes: Set({"catto"}), sortable_attributes: NotSet, ranking_rules: NotSet, stop_words: NotSet, non_separator_tokens: NotSet, separator_tokens: NotSet, dictionary: NotSet, synonyms: NotSet, distinct_attribute: NotSet, proximity_precision: NotSet, typo_tolerance: NotSet, faceting: NotSet, pagination: NotSet, embedders: NotSet, search_cutoff_ms: NotSet, localized_attributes: NotSet, _kind: PhantomData<meilisearch_types::settings::Unchecked> } }, kind: SettingsUpdate { index_uid: "doggos", new_settings: Settings { displayed_attributes: WildcardSetting(NotSet), searchable_attributes: WildcardSetting(NotSet), filterable_attributes: Set({"catto"}), sortable_attributes: NotSet, ranking_rules: NotSet, stop_words: NotSet, non_separator_tokens: NotSet, separator_tokens: NotSet, dictionary: NotSet, synonyms: NotSet, distinct_attribute: NotSet, proximity_precision: NotSet, typo_tolerance: NotSet, faceting: NotSet, pagination: NotSet, embedders: NotSet, search_cutoff_ms: NotSet, localized_attributes: NotSet, _kind: PhantomData<meilisearch_types::settings::Unchecked> }, is_deletion: false, allow_index_creation: true }}
-1 {uid: 1, status: enqueued, details: { received_documents: 3, indexed_documents: None }, kind: DocumentAdditionOrUpdate { index_uid: "doggos", primary_key: Some("id"), method: ReplaceDocuments, content_file: 00000000-0000-0000-0000-000000000000, documents_count: 3, allow_index_creation: true }}
----------------------------------------------------------------------
-### Status:
-enqueued [0,1,]
----------------------------------------------------------------------
-### Kind:
-"documentAdditionOrUpdate" [1,]
-"settingsUpdate" [0,]
----------------------------------------------------------------------
-### Index Tasks:
-doggos [0,1,]
----------------------------------------------------------------------
-### Index Mapper:
-
----------------------------------------------------------------------
-### Canceled By:
-
----------------------------------------------------------------------
-### Enqueued At:
-[timestamp] [0,]
-[timestamp] [1,]
----------------------------------------------------------------------
-### Started At:
----------------------------------------------------------------------
-### Finished At:
----------------------------------------------------------------------
-### File Store:
-00000000-0000-0000-0000-000000000000
-
----------------------------------------------------------------------
--- a/index-scheduler/src/snapshots/lib.rs/import_vectors/Intel
+++ b/index-scheduler/src/snapshots/lib.rs/import_vectors/Intel
@@ -6,7 +6,7 @@ source: index-scheduler/src/lib.rs
 []
 ----------------------------------------------------------------------
 ### All Tasks:
-0 {uid: 0, status: succeeded, details: { settings: Settings { displayed_attributes: WildcardSetting(NotSet), searchable_attributes: WildcardSetting(NotSet), filterable_attributes: NotSet, sortable_attributes: NotSet, ranking_rules: NotSet, stop_words: NotSet, non_separator_tokens: NotSet, separator_tokens: NotSet, dictionary: NotSet, synonyms: NotSet, distinct_attribute: NotSet, proximity_precision: NotSet, typo_tolerance: NotSet, faceting: NotSet, pagination: NotSet, embedders: Set({"A_fakerest": Set(EmbeddingSettings { source: Set(Rest), model: NotSet, revision: NotSet, api_key: Set("My super secret"), dimensions: Set(384), binary_quantized: NotSet, document_template: NotSet, document_template_max_bytes: NotSet, url: Set("http://localhost:7777"), request: Set(String("{{text}}")), response: Set(String("{{embedding}}")), headers: NotSet, distribution: NotSet }), "B_small_hf": Set(EmbeddingSettings { source: Set(HuggingFace), model: Set("sentence-transformers/all-MiniLM-L6-v2"), revision: Set("e4ce9877abf3edfe10b0d82785e83bdcb973e22e"), api_key: NotSet, dimensions: NotSet, binary_quantized: NotSet, document_template: Set("{{doc.doggo}} the {{doc.breed}} best doggo"), document_template_max_bytes: NotSet, url: NotSet, request: NotSet, response: NotSet, headers: NotSet, distribution: NotSet })}), search_cutoff_ms: NotSet, localized_attributes: NotSet, _kind: PhantomData<meilisearch_types::settings::Unchecked> } }, kind: SettingsUpdate { index_uid: "doggos", new_settings: Settings { displayed_attributes: WildcardSetting(NotSet), searchable_attributes: WildcardSetting(NotSet), filterable_attributes: NotSet, sortable_attributes: NotSet, ranking_rules: NotSet, stop_words: NotSet, non_separator_tokens: NotSet, separator_tokens: NotSet, dictionary: NotSet, synonyms: NotSet, distinct_attribute: NotSet, proximity_precision: NotSet, typo_tolerance: NotSet, faceting: NotSet, pagination: NotSet, embedders: Set({"A_fakerest": Set(EmbeddingSettings { source: Set(Rest), model: NotSet, revision: NotSet, api_key: Set("My super secret"), dimensions: Set(384), binary_quantized: NotSet, document_template: NotSet, document_template_max_bytes: NotSet, url: Set("http://localhost:7777"), request: Set(String("{{text}}")), response: Set(String("{{embedding}}")), headers: NotSet, distribution: NotSet }), "B_small_hf": Set(EmbeddingSettings { source: Set(HuggingFace), model: Set("sentence-transformers/all-MiniLM-L6-v2"), revision: Set("e4ce9877abf3edfe10b0d82785e83bdcb973e22e"), api_key: NotSet, dimensions: NotSet, binary_quantized: NotSet, document_template: Set("{{doc.doggo}} the {{doc.breed}} best doggo"), document_template_max_bytes: NotSet, url: NotSet, request: NotSet, response: NotSet, headers: NotSet, distribution: NotSet })}), search_cutoff_ms: NotSet, localized_attributes: NotSet, _kind: PhantomData<meilisearch_types::settings::Unchecked> }, is_deletion: false, allow_index_creation: true }}
+0 {uid: 0, status: succeeded, details: { settings: Settings { displayed_attributes: WildcardSetting(NotSet), searchable_attributes: WildcardSetting(NotSet), filterable_attributes: NotSet, sortable_attributes: NotSet, ranking_rules: NotSet, stop_words: NotSet, non_separator_tokens: NotSet, separator_tokens: NotSet, dictionary: NotSet, synonyms: NotSet, distinct_attribute: NotSet, proximity_precision: NotSet, typo_tolerance: NotSet, faceting: NotSet, pagination: NotSet, embedders: Set({"A_fakerest": Set(EmbeddingSettings { source: Set(Rest), model: NotSet, revision: NotSet, api_key: Set("My super secret"), dimensions: Set(384), document_template: NotSet, url: Set("http://localhost:7777"), query: NotSet, input_field: NotSet, path_to_embeddings: NotSet, embedding_object: NotSet, input_type: NotSet, distribution: NotSet }), "B_small_hf": Set(EmbeddingSettings { source: Set(HuggingFace), model: Set("sentence-transformers/all-MiniLM-L6-v2"), revision: Set("e4ce9877abf3edfe10b0d82785e83bdcb973e22e"), api_key: NotSet, dimensions: NotSet, document_template: Set("{{doc.doggo}} the {{doc.breed}} best doggo"), url: NotSet, query: NotSet, input_field: NotSet, path_to_embeddings: NotSet, embedding_object: NotSet, input_type: NotSet, distribution: NotSet })}), search_cutoff_ms: NotSet, _kind: PhantomData<meilisearch_types::settings::Unchecked> } }, kind: SettingsUpdate { index_uid: "doggos", new_settings: Settings { displayed_attributes: WildcardSetting(NotSet), searchable_attributes: WildcardSetting(NotSet), filterable_attributes: NotSet, sortable_attributes: NotSet, ranking_rules: NotSet, stop_words: NotSet, non_separator_tokens: NotSet, separator_tokens: NotSet, dictionary: NotSet, synonyms: NotSet, distinct_attribute: NotSet, proximity_precision: NotSet, typo_tolerance: NotSet, faceting: NotSet, pagination: NotSet, embedders: Set({"A_fakerest": Set(EmbeddingSettings { source: Set(Rest), model: NotSet, revision: NotSet, api_key: Set("My super secret"), dimensions: Set(384), document_template: NotSet, url: Set("http://localhost:7777"), query: NotSet, input_field: NotSet, path_to_embeddings: NotSet, embedding_object: NotSet, input_type: NotSet, distribution: NotSet }), "B_small_hf": Set(EmbeddingSettings { source: Set(HuggingFace), model: Set("sentence-transformers/all-MiniLM-L6-v2"), revision: Set("e4ce9877abf3edfe10b0d82785e83bdcb973e22e"), api_key: NotSet, dimensions: NotSet, document_template: Set("{{doc.doggo}} the {{doc.breed}} best doggo"), url: NotSet, query: NotSet, input_field: NotSet, path_to_embeddings: NotSet, embedding_object: NotSet, input_type: NotSet, distribution: NotSet })}), search_cutoff_ms: NotSet, _kind: PhantomData<meilisearch_types::settings::Unchecked> }, is_deletion: false, allow_index_creation: true }}
 1 {uid: 1, status: succeeded, details: { received_documents: 1, indexed_documents: Some(1) }, kind: DocumentAdditionOrUpdate { index_uid: "doggos", primary_key: Some("id"), method: UpdateDocuments, content_file: 00000000-0000-0000-0000-000000000000, documents_count: 1, allow_index_creation: true }}
 2 {uid: 2, status: succeeded, details: { received_documents: 1, indexed_documents: Some(1) }, kind: DocumentAdditionOrUpdate { index_uid: "doggos", primary_key: None, method: UpdateDocuments, content_file: 00000000-0000-0000-0000-000000000001, documents_count: 1, allow_index_creation: true }}
 ----------------------------------------------------------------------
@@ -46,3 +46,4 @@ doggos: { number_of_documents: 1, field_distribution: {"_vectors": 1, "breed": 1
 ### File Store:

 ----------------------------------------------------------------------
+
--- a/index-scheduler/src/snapshots/lib.rs/import_vectors/Intel
+++ b/index-scheduler/src/snapshots/lib.rs/import_vectors/Intel
@@ -6,7 +6,7 @@ source: index-scheduler/src/lib.rs
 []
 ----------------------------------------------------------------------
 ### All Tasks:
-0 {uid: 0, status: succeeded, details: { settings: Settings { displayed_attributes: WildcardSetting(NotSet), searchable_attributes: WildcardSetting(NotSet), filterable_attributes: NotSet, sortable_attributes: NotSet, ranking_rules: NotSet, stop_words: NotSet, non_separator_tokens: NotSet, separator_tokens: NotSet, dictionary: NotSet, synonyms: NotSet, distinct_attribute: NotSet, proximity_precision: NotSet, typo_tolerance: NotSet, faceting: NotSet, pagination: NotSet, embedders: Set({"A_fakerest": Set(EmbeddingSettings { source: Set(Rest), model: NotSet, revision: NotSet, api_key: Set("My super secret"), dimensions: Set(384), binary_quantized: NotSet, document_template: NotSet, document_template_max_bytes: NotSet, url: Set("http://localhost:7777"), request: Set(String("{{text}}")), response: Set(String("{{embedding}}")), headers: NotSet, distribution: NotSet }), "B_small_hf": Set(EmbeddingSettings { source: Set(HuggingFace), model: Set("sentence-transformers/all-MiniLM-L6-v2"), revision: Set("e4ce9877abf3edfe10b0d82785e83bdcb973e22e"), api_key: NotSet, dimensions: NotSet, binary_quantized: NotSet, document_template: Set("{{doc.doggo}} the {{doc.breed}} best doggo"), document_template_max_bytes: NotSet, url: NotSet, request: NotSet, response: NotSet, headers: NotSet, distribution: NotSet })}), search_cutoff_ms: NotSet, localized_attributes: NotSet, _kind: PhantomData<meilisearch_types::settings::Unchecked> } }, kind: SettingsUpdate { index_uid: "doggos", new_settings: Settings { displayed_attributes: WildcardSetting(NotSet), searchable_attributes: WildcardSetting(NotSet), filterable_attributes: NotSet, sortable_attributes: NotSet, ranking_rules: NotSet, stop_words: NotSet, non_separator_tokens: NotSet, separator_tokens: NotSet, dictionary: NotSet, synonyms: NotSet, distinct_attribute: NotSet, proximity_precision: NotSet, typo_tolerance: NotSet, faceting: NotSet, pagination: NotSet, embedders: Set({"A_fakerest": Set(EmbeddingSettings { source: Set(Rest), model: NotSet, revision: NotSet, api_key: Set("My super secret"), dimensions: Set(384), binary_quantized: NotSet, document_template: NotSet, document_template_max_bytes: NotSet, url: Set("http://localhost:7777"), request: Set(String("{{text}}")), response: Set(String("{{embedding}}")), headers: NotSet, distribution: NotSet }), "B_small_hf": Set(EmbeddingSettings { source: Set(HuggingFace), model: Set("sentence-transformers/all-MiniLM-L6-v2"), revision: Set("e4ce9877abf3edfe10b0d82785e83bdcb973e22e"), api_key: NotSet, dimensions: NotSet, binary_quantized: NotSet, document_template: Set("{{doc.doggo}} the {{doc.breed}} best doggo"), document_template_max_bytes: NotSet, url: NotSet, request: NotSet, response: NotSet, headers: NotSet, distribution: NotSet })}), search_cutoff_ms: NotSet, localized_attributes: NotSet, _kind: PhantomData<meilisearch_types::settings::Unchecked> }, is_deletion: false, allow_index_creation: true }}
+0 {uid: 0, status: succeeded, details: { settings: Settings { displayed_attributes: WildcardSetting(NotSet), searchable_attributes: WildcardSetting(NotSet), filterable_attributes: NotSet, sortable_attributes: NotSet, ranking_rules: NotSet, stop_words: NotSet, non_separator_tokens: NotSet, separator_tokens: NotSet, dictionary: NotSet, synonyms: NotSet, distinct_attribute: NotSet, proximity_precision: NotSet, typo_tolerance: NotSet, faceting: NotSet, pagination: NotSet, embedders: Set({"A_fakerest": Set(EmbeddingSettings { source: Set(Rest), model: NotSet, revision: NotSet, api_key: Set("My super secret"), dimensions: Set(384), document_template: NotSet, url: Set("http://localhost:7777"), query: NotSet, input_field: NotSet, path_to_embeddings: NotSet, embedding_object: NotSet, input_type: NotSet, distribution: NotSet }), "B_small_hf": Set(EmbeddingSettings { source: Set(HuggingFace), model: Set("sentence-transformers/all-MiniLM-L6-v2"), revision: Set("e4ce9877abf3edfe10b0d82785e83bdcb973e22e"), api_key: NotSet, dimensions: NotSet, document_template: Set("{{doc.doggo}} the {{doc.breed}} best doggo"), url: NotSet, query: NotSet, input_field: NotSet, path_to_embeddings: NotSet, embedding_object: NotSet, input_type: NotSet, distribution: NotSet })}), search_cutoff_ms: NotSet, _kind: PhantomData<meilisearch_types::settings::Unchecked> } }, kind: SettingsUpdate { index_uid: "doggos", new_settings: Settings { displayed_attributes: WildcardSetting(NotSet), searchable_attributes: WildcardSetting(NotSet), filterable_attributes: NotSet, sortable_attributes: NotSet, ranking_rules: NotSet, stop_words: NotSet, non_separator_tokens: NotSet, separator_tokens: NotSet, dictionary: NotSet, synonyms: NotSet, distinct_attribute: NotSet, proximity_precision: NotSet, typo_tolerance: NotSet, faceting: NotSet, pagination: NotSet, embedders: Set({"A_fakerest": Set(EmbeddingSettings { source: Set(Rest), model: NotSet, revision: NotSet, api_key: Set("My super secret"), dimensions: Set(384), document_template: NotSet, url: Set("http://localhost:7777"), query: NotSet, input_field: NotSet, path_to_embeddings: NotSet, embedding_object: NotSet, input_type: NotSet, distribution: NotSet }), "B_small_hf": Set(EmbeddingSettings { source: Set(HuggingFace), model: Set("sentence-transformers/all-MiniLM-L6-v2"), revision: Set("e4ce9877abf3edfe10b0d82785e83bdcb973e22e"), api_key: NotSet, dimensions: NotSet, document_template: Set("{{doc.doggo}} the {{doc.breed}} best doggo"), url: NotSet, query: NotSet, input_field: NotSet, path_to_embeddings: NotSet, embedding_object: NotSet, input_type: NotSet, distribution: NotSet })}), search_cutoff_ms: NotSet, _kind: PhantomData<meilisearch_types::settings::Unchecked> }, is_deletion: false, allow_index_creation: true }}
 1 {uid: 1, status: succeeded, details: { received_documents: 1, indexed_documents: Some(1) }, kind: DocumentAdditionOrUpdate { index_uid: "doggos", primary_key: Some("id"), method: UpdateDocuments, content_file: 00000000-0000-0000-0000-000000000000, documents_count: 1, allow_index_creation: true }}
 2 {uid: 2, status: enqueued, details: { received_documents: 1, indexed_documents: None }, kind: DocumentAdditionOrUpdate { index_uid: "doggos", primary_key: None, method: UpdateDocuments, content_file: 00000000-0000-0000-0000-000000000001, documents_count: 1, allow_index_creation: true }}
 ----------------------------------------------------------------------
@@ -45,3 +45,4 @@ doggos: { number_of_documents: 1, field_distribution: {"_vectors": 1, "breed": 1
 00000000-0000-0000-0000-000000000001

 ----------------------------------------------------------------------
+
--- a/index-scheduler/src/snapshots/lib.rs/import_vectors/adding
+++ b/index-scheduler/src/snapshots/lib.rs/import_vectors/adding
@@ -6,7 +6,7 @@ source: index-scheduler/src/lib.rs
 []
 ----------------------------------------------------------------------
 ### All Tasks:
-0 {uid: 0, status: succeeded, details: { settings: Settings { displayed_attributes: WildcardSetting(NotSet), searchable_attributes: WildcardSetting(NotSet), filterable_attributes: NotSet, sortable_attributes: NotSet, ranking_rules: NotSet, stop_words: NotSet, non_separator_tokens: NotSet, separator_tokens: NotSet, dictionary: NotSet, synonyms: NotSet, distinct_attribute: NotSet, proximity_precision: NotSet, typo_tolerance: NotSet, faceting: NotSet, pagination: NotSet, embedders: Set({"A_fakerest": Set(EmbeddingSettings { source: Set(Rest), model: NotSet, revision: NotSet, api_key: Set("My super secret"), dimensions: Set(384), binary_quantized: NotSet, document_template: NotSet, document_template_max_bytes: NotSet, url: Set("http://localhost:7777"), request: Set(String("{{text}}")), response: Set(String("{{embedding}}")), headers: NotSet, distribution: NotSet }), "B_small_hf": Set(EmbeddingSettings { source: Set(HuggingFace), model: Set("sentence-transformers/all-MiniLM-L6-v2"), revision: Set("e4ce9877abf3edfe10b0d82785e83bdcb973e22e"), api_key: NotSet, dimensions: NotSet, binary_quantized: NotSet, document_template: Set("{{doc.doggo}} the {{doc.breed}} best doggo"), document_template_max_bytes: NotSet, url: NotSet, request: NotSet, response: NotSet, headers: NotSet, distribution: NotSet })}), search_cutoff_ms: NotSet, localized_attributes: NotSet, _kind: PhantomData<meilisearch_types::settings::Unchecked> } }, kind: SettingsUpdate { index_uid: "doggos", new_settings: Settings { displayed_attributes: WildcardSetting(NotSet), searchable_attributes: WildcardSetting(NotSet), filterable_attributes: NotSet, sortable_attributes: NotSet, ranking_rules: NotSet, stop_words: NotSet, non_separator_tokens: NotSet, separator_tokens: NotSet, dictionary: NotSet, synonyms: NotSet, distinct_attribute: NotSet, proximity_precision: NotSet, typo_tolerance: NotSet, faceting: NotSet, pagination: NotSet, embedders: Set({"A_fakerest": Set(EmbeddingSettings { source: Set(Rest), model: NotSet, revision: NotSet, api_key: Set("My super secret"), dimensions: Set(384), binary_quantized: NotSet, document_template: NotSet, document_template_max_bytes: NotSet, url: Set("http://localhost:7777"), request: Set(String("{{text}}")), response: Set(String("{{embedding}}")), headers: NotSet, distribution: NotSet }), "B_small_hf": Set(EmbeddingSettings { source: Set(HuggingFace), model: Set("sentence-transformers/all-MiniLM-L6-v2"), revision: Set("e4ce9877abf3edfe10b0d82785e83bdcb973e22e"), api_key: NotSet, dimensions: NotSet, binary_quantized: NotSet, document_template: Set("{{doc.doggo}} the {{doc.breed}} best doggo"), document_template_max_bytes: NotSet, url: NotSet, request: NotSet, response: NotSet, headers: NotSet, distribution: NotSet })}), search_cutoff_ms: NotSet, localized_attributes: NotSet, _kind: PhantomData<meilisearch_types::settings::Unchecked> }, is_deletion: false, allow_index_creation: true }}
+0 {uid: 0, status: succeeded, details: { settings: Settings { displayed_attributes: WildcardSetting(NotSet), searchable_attributes: WildcardSetting(NotSet), filterable_attributes: NotSet, sortable_attributes: NotSet, ranking_rules: NotSet, stop_words: NotSet, non_separator_tokens: NotSet, separator_tokens: NotSet, dictionary: NotSet, synonyms: NotSet, distinct_attribute: NotSet, proximity_precision: NotSet, typo_tolerance: NotSet, faceting: NotSet, pagination: NotSet, embedders: Set({"A_fakerest": Set(EmbeddingSettings { source: Set(Rest), model: NotSet, revision: NotSet, api_key: Set("My super secret"), dimensions: Set(384), document_template: NotSet, url: Set("http://localhost:7777"), query: NotSet, input_field: NotSet, path_to_embeddings: NotSet, embedding_object: NotSet, input_type: NotSet, distribution: NotSet }), "B_small_hf": Set(EmbeddingSettings { source: Set(HuggingFace), model: Set("sentence-transformers/all-MiniLM-L6-v2"), revision: Set("e4ce9877abf3edfe10b0d82785e83bdcb973e22e"), api_key: NotSet, dimensions: NotSet, document_template: Set("{{doc.doggo}} the {{doc.breed}} best doggo"), url: NotSet, query: NotSet, input_field: NotSet, path_to_embeddings: NotSet, embedding_object: NotSet, input_type: NotSet, distribution: NotSet })}), search_cutoff_ms: NotSet, _kind: PhantomData<meilisearch_types::settings::Unchecked> } }, kind: SettingsUpdate { index_uid: "doggos", new_settings: Settings { displayed_attributes: WildcardSetting(NotSet), searchable_attributes: WildcardSetting(NotSet), filterable_attributes: NotSet, sortable_attributes: NotSet, ranking_rules: NotSet, stop_words: NotSet, non_separator_tokens: NotSet, separator_tokens: NotSet, dictionary: NotSet, synonyms: NotSet, distinct_attribute: NotSet, proximity_precision: NotSet, typo_tolerance: NotSet, faceting: NotSet, pagination: NotSet, embedders: Set({"A_fakerest": Set(EmbeddingSettings { source: Set(Rest), model: NotSet, revision: NotSet, api_key: Set("My super secret"), dimensions: Set(384), document_template: NotSet, url: Set("http://localhost:7777"), query: NotSet, input_field: NotSet, path_to_embeddings: NotSet, embedding_object: NotSet, input_type: NotSet, distribution: NotSet }), "B_small_hf": Set(EmbeddingSettings { source: Set(HuggingFace), model: Set("sentence-transformers/all-MiniLM-L6-v2"), revision: Set("e4ce9877abf3edfe10b0d82785e83bdcb973e22e"), api_key: NotSet, dimensions: NotSet, document_template: Set("{{doc.doggo}} the {{doc.breed}} best doggo"), url: NotSet, query: NotSet, input_field: NotSet, path_to_embeddings: NotSet, embedding_object: NotSet, input_type: NotSet, distribution: NotSet })}), search_cutoff_ms: NotSet, _kind: PhantomData<meilisearch_types::settings::Unchecked> }, is_deletion: false, allow_index_creation: true }}
 1 {uid: 1, status: succeeded, details: { received_documents: 1, indexed_documents: Some(1) }, kind: DocumentAdditionOrUpdate { index_uid: "doggos", primary_key: Some("id"), method: UpdateDocuments, content_file: 00000000-0000-0000-0000-000000000000, documents_count: 1, allow_index_creation: true }}
 ----------------------------------------------------------------------
 ### Status:
@@ -42,3 +42,4 @@ doggos: { number_of_documents: 1, field_distribution: {"_vectors": 1, "breed": 1
 ### File Store:

 ----------------------------------------------------------------------
+
--- a/index-scheduler/src/snapshots/lib.rs/import_vectors/after
+++ b/index-scheduler/src/snapshots/lib.rs/import_vectors/after
@@ -6,7 +6,7 @@ source: index-scheduler/src/lib.rs
 []
 ----------------------------------------------------------------------
 ### All Tasks:
-0 {uid: 0, status: succeeded, details: { settings: Settings { displayed_attributes: WildcardSetting(NotSet), searchable_attributes: WildcardSetting(NotSet), filterable_attributes: NotSet, sortable_attributes: NotSet, ranking_rules: NotSet, stop_words: NotSet, non_separator_tokens: NotSet, separator_tokens: NotSet, dictionary: NotSet, synonyms: NotSet, distinct_attribute: NotSet, proximity_precision: NotSet, typo_tolerance: NotSet, faceting: NotSet, pagination: NotSet, embedders: Set({"A_fakerest": Set(EmbeddingSettings { source: Set(Rest), model: NotSet, revision: NotSet, api_key: Set("My super secret"), dimensions: Set(384), binary_quantized: NotSet, document_template: NotSet, document_template_max_bytes: NotSet, url: Set("http://localhost:7777"), request: Set(String("{{text}}")), response: Set(String("{{embedding}}")), headers: NotSet, distribution: NotSet }), "B_small_hf": Set(EmbeddingSettings { source: Set(HuggingFace), model: Set("sentence-transformers/all-MiniLM-L6-v2"), revision: Set("e4ce9877abf3edfe10b0d82785e83bdcb973e22e"), api_key: NotSet, dimensions: NotSet, binary_quantized: NotSet, document_template: Set("{{doc.doggo}} the {{doc.breed}} best doggo"), document_template_max_bytes: NotSet, url: NotSet, request: NotSet, response: NotSet, headers: NotSet, distribution: NotSet })}), search_cutoff_ms: NotSet, localized_attributes: NotSet, _kind: PhantomData<meilisearch_types::settings::Unchecked> } }, kind: SettingsUpdate { index_uid: "doggos", new_settings: Settings { displayed_attributes: WildcardSetting(NotSet), searchable_attributes: WildcardSetting(NotSet), filterable_attributes: NotSet, sortable_attributes: NotSet, ranking_rules: NotSet, stop_words: NotSet, non_separator_tokens: NotSet, separator_tokens: NotSet, dictionary: NotSet, synonyms: NotSet, distinct_attribute: NotSet, proximity_precision: NotSet, typo_tolerance: NotSet, faceting: NotSet, pagination: NotSet, embedders: Set({"A_fakerest": Set(EmbeddingSettings { source: Set(Rest), model: NotSet, revision: NotSet, api_key: Set("My super secret"), dimensions: Set(384), binary_quantized: NotSet, document_template: NotSet, document_template_max_bytes: NotSet, url: Set("http://localhost:7777"), request: Set(String("{{text}}")), response: Set(String("{{embedding}}")), headers: NotSet, distribution: NotSet }), "B_small_hf": Set(EmbeddingSettings { source: Set(HuggingFace), model: Set("sentence-transformers/all-MiniLM-L6-v2"), revision: Set("e4ce9877abf3edfe10b0d82785e83bdcb973e22e"), api_key: NotSet, dimensions: NotSet, binary_quantized: NotSet, document_template: Set("{{doc.doggo}} the {{doc.breed}} best doggo"), document_template_max_bytes: NotSet, url: NotSet, request: NotSet, response: NotSet, headers: NotSet, distribution: NotSet })}), search_cutoff_ms: NotSet, localized_attributes: NotSet, _kind: PhantomData<meilisearch_types::settings::Unchecked> }, is_deletion: false, allow_index_creation: true }}
+0 {uid: 0, status: succeeded, details: { settings: Settings { displayed_attributes: WildcardSetting(NotSet), searchable_attributes: WildcardSetting(NotSet), filterable_attributes: NotSet, sortable_attributes: NotSet, ranking_rules: NotSet, stop_words: NotSet, non_separator_tokens: NotSet, separator_tokens: NotSet, dictionary: NotSet, synonyms: NotSet, distinct_attribute: NotSet, proximity_precision: NotSet, typo_tolerance: NotSet, faceting: NotSet, pagination: NotSet, embedders: Set({"A_fakerest": Set(EmbeddingSettings { source: Set(Rest), model: NotSet, revision: NotSet, api_key: Set("My super secret"), dimensions: Set(384), document_template: NotSet, url: Set("http://localhost:7777"), query: NotSet, input_field: NotSet, path_to_embeddings: NotSet, embedding_object: NotSet, input_type: NotSet, distribution: NotSet }), "B_small_hf": Set(EmbeddingSettings { source: Set(HuggingFace), model: Set("sentence-transformers/all-MiniLM-L6-v2"), revision: Set("e4ce9877abf3edfe10b0d82785e83bdcb973e22e"), api_key: NotSet, dimensions: NotSet, document_template: Set("{{doc.doggo}} the {{doc.breed}} best doggo"), url: NotSet, query: NotSet, input_field: NotSet, path_to_embeddings: NotSet, embedding_object: NotSet, input_type: NotSet, distribution: NotSet })}), search_cutoff_ms: NotSet, _kind: PhantomData<meilisearch_types::settings::Unchecked> } }, kind: SettingsUpdate { index_uid: "doggos", new_settings: Settings { displayed_attributes: WildcardSetting(NotSet), searchable_attributes: WildcardSetting(NotSet), filterable_attributes: NotSet, sortable_attributes: NotSet, ranking_rules: NotSet, stop_words: NotSet, non_separator_tokens: NotSet, separator_tokens: NotSet, dictionary: NotSet, synonyms: NotSet, distinct_attribute: NotSet, proximity_precision: NotSet, typo_tolerance: NotSet, faceting: NotSet, pagination: NotSet, embedders: Set({"A_fakerest": Set(EmbeddingSettings { source: Set(Rest), model: NotSet, revision: NotSet, api_key: Set("My super secret"), dimensions: Set(384), document_template: NotSet, url: Set("http://localhost:7777"), query: NotSet, input_field: NotSet, path_to_embeddings: NotSet, embedding_object: NotSet, input_type: NotSet, distribution: NotSet }), "B_small_hf": Set(EmbeddingSettings { source: Set(HuggingFace), model: Set("sentence-transformers/all-MiniLM-L6-v2"), revision: Set("e4ce9877abf3edfe10b0d82785e83bdcb973e22e"), api_key: NotSet, dimensions: NotSet, document_template: Set("{{doc.doggo}} the {{doc.breed}} best doggo"), url: NotSet, query: NotSet, input_field: NotSet, path_to_embeddings: NotSet, embedding_object: NotSet, input_type: NotSet, distribution: NotSet })}), search_cutoff_ms: NotSet, _kind: PhantomData<meilisearch_types::settings::Unchecked> }, is_deletion: false, allow_index_creation: true }}
 1 {uid: 1, status: enqueued, details: { received_documents: 1, indexed_documents: None }, kind: DocumentAdditionOrUpdate { index_uid: "doggos", primary_key: Some("id"), method: UpdateDocuments, content_file: 00000000-0000-0000-0000-000000000000, documents_count: 1, allow_index_creation: true }}
 ----------------------------------------------------------------------
 ### Status:
@@ -41,3 +41,4 @@ doggos: { number_of_documents: 0, field_distribution: {} }
 00000000-0000-0000-0000-000000000000

 ----------------------------------------------------------------------
+
--- a/index-scheduler/src/snapshots/lib.rs/import_vectors/after_registering_settings_task_vectors.snap
+++ b/index-scheduler/src/snapshots/lib.rs/import_vectors/after_registering_settings_task_vectors.snap
@@ -6,7 +6,7 @@ source: index-scheduler/src/lib.rs
 []
 ----------------------------------------------------------------------
 ### All Tasks:
-0 {uid: 0, status: enqueued, details: { settings: Settings { displayed_attributes: WildcardSetting(NotSet), searchable_attributes: WildcardSetting(NotSet), filterable_attributes: NotSet, sortable_attributes: NotSet, ranking_rules: NotSet, stop_words: NotSet, non_separator_tokens: NotSet, separator_tokens: NotSet, dictionary: NotSet, synonyms: NotSet, distinct_attribute: NotSet, proximity_precision: NotSet, typo_tolerance: NotSet, faceting: NotSet, pagination: NotSet, embedders: Set({"A_fakerest": Set(EmbeddingSettings { source: Set(Rest), model: NotSet, revision: NotSet, api_key: Set("My super secret"), dimensions: Set(384), binary_quantized: NotSet, document_template: NotSet, document_template_max_bytes: NotSet, url: Set("http://localhost:7777"), request: Set(String("{{text}}")), response: Set(String("{{embedding}}")), headers: NotSet, distribution: NotSet }), "B_small_hf": Set(EmbeddingSettings { source: Set(HuggingFace), model: Set("sentence-transformers/all-MiniLM-L6-v2"), revision: Set("e4ce9877abf3edfe10b0d82785e83bdcb973e22e"), api_key: NotSet, dimensions: NotSet, binary_quantized: NotSet, document_template: Set("{{doc.doggo}} the {{doc.breed}} best doggo"), document_template_max_bytes: NotSet, url: NotSet, request: NotSet, response: NotSet, headers: NotSet, distribution: NotSet })}), search_cutoff_ms: NotSet, localized_attributes: NotSet, _kind: PhantomData<meilisearch_types::settings::Unchecked> } }, kind: SettingsUpdate { index_uid: "doggos", new_settings: Settings { displayed_attributes: WildcardSetting(NotSet), searchable_attributes: WildcardSetting(NotSet), filterable_attributes: NotSet, sortable_attributes: NotSet, ranking_rules: NotSet, stop_words: NotSet, non_separator_tokens: NotSet, separator_tokens: NotSet, dictionary: NotSet, synonyms: NotSet, distinct_attribute: NotSet, proximity_precision: NotSet, typo_tolerance: NotSet, faceting: NotSet, pagination: NotSet, embedders: Set({"A_fakerest": Set(EmbeddingSettings { source: Set(Rest), model: NotSet, revision: NotSet, api_key: Set("My super secret"), dimensions: Set(384), binary_quantized: NotSet, document_template: NotSet, document_template_max_bytes: NotSet, url: Set("http://localhost:7777"), request: Set(String("{{text}}")), response: Set(String("{{embedding}}")), headers: NotSet, distribution: NotSet }), "B_small_hf": Set(EmbeddingSettings { source: Set(HuggingFace), model: Set("sentence-transformers/all-MiniLM-L6-v2"), revision: Set("e4ce9877abf3edfe10b0d82785e83bdcb973e22e"), api_key: NotSet, dimensions: NotSet, binary_quantized: NotSet, document_template: Set("{{doc.doggo}} the {{doc.breed}} best doggo"), document_template_max_bytes: NotSet, url: NotSet, request: NotSet, response: NotSet, headers: NotSet, distribution: NotSet })}), search_cutoff_ms: NotSet, localized_attributes: NotSet, _kind: PhantomData<meilisearch_types::settings::Unchecked> }, is_deletion: false, allow_index_creation: true }}
+0 {uid: 0, status: enqueued, details: { settings: Settings { displayed_attributes: WildcardSetting(NotSet), searchable_attributes: WildcardSetting(NotSet), filterable_attributes: NotSet, sortable_attributes: NotSet, ranking_rules: NotSet, stop_words: NotSet, non_separator_tokens: NotSet, separator_tokens: NotSet, dictionary: NotSet, synonyms: NotSet, distinct_attribute: NotSet, proximity_precision: NotSet, typo_tolerance: NotSet, faceting: NotSet, pagination: NotSet, embedders: Set({"A_fakerest": Set(EmbeddingSettings { source: Set(Rest), model: NotSet, revision: NotSet, api_key: Set("My super secret"), dimensions: Set(384), document_template: NotSet, url: Set("http://localhost:7777"), query: NotSet, input_field: NotSet, path_to_embeddings: NotSet, embedding_object: NotSet, input_type: NotSet, distribution: NotSet }), "B_small_hf": Set(EmbeddingSettings { source: Set(HuggingFace), model: Set("sentence-transformers/all-MiniLM-L6-v2"), revision: Set("e4ce9877abf3edfe10b0d82785e83bdcb973e22e"), api_key: NotSet, dimensions: NotSet, document_template: Set("{{doc.doggo}} the {{doc.breed}} best doggo"), url: NotSet, query: NotSet, input_field: NotSet, path_to_embeddings: NotSet, embedding_object: NotSet, input_type: NotSet, distribution: NotSet })}), search_cutoff_ms: NotSet, _kind: PhantomData<meilisearch_types::settings::Unchecked> } }, kind: SettingsUpdate { index_uid: "doggos", new_settings: Settings { displayed_attributes: WildcardSetting(NotSet), searchable_attributes: WildcardSetting(NotSet), filterable_attributes: NotSet, sortable_attributes: NotSet, ranking_rules: NotSet, stop_words: NotSet, non_separator_tokens: NotSet, separator_tokens: NotSet, dictionary: NotSet, synonyms: NotSet, distinct_attribute: NotSet, proximity_precision: NotSet, typo_tolerance: NotSet, faceting: NotSet, pagination: NotSet, embedders: Set({"A_fakerest": Set(EmbeddingSettings { source: Set(Rest), model: NotSet, revision: NotSet, api_key: Set("My super secret"), dimensions: Set(384), document_template: NotSet, url: Set("http://localhost:7777"), query: NotSet, input_field: NotSet, path_to_embeddings: NotSet, embedding_object: NotSet, input_type: NotSet, distribution: NotSet }), "B_small_hf": Set(EmbeddingSettings { source: Set(HuggingFace), model: Set("sentence-transformers/all-MiniLM-L6-v2"), revision: Set("e4ce9877abf3edfe10b0d82785e83bdcb973e22e"), api_key: NotSet, dimensions: NotSet, document_template: Set("{{doc.doggo}} the {{doc.breed}} best doggo"), url: NotSet, query: NotSet, input_field: NotSet, path_to_embeddings: NotSet, embedding_object: NotSet, input_type: NotSet, distribution: NotSet })}), search_cutoff_ms: NotSet, _kind: PhantomData<meilisearch_types::settings::Unchecked> }, is_deletion: false, allow_index_creation: true }}
 ----------------------------------------------------------------------
 ### Status:
 enqueued [0,]
@@ -33,3 +33,4 @@ doggos [0,]
 ### File Store:

 ----------------------------------------------------------------------
+
--- a/index-scheduler/src/snapshots/lib.rs/import_vectors/settings_update_processed_vectors.snap
+++ b/index-scheduler/src/snapshots/lib.rs/import_vectors/settings_update_processed_vectors.snap
@@ -6,7 +6,7 @@ source: index-scheduler/src/lib.rs
 []
 ----------------------------------------------------------------------
 ### All Tasks:
-0 {uid: 0, status: succeeded, details: { settings: Settings { displayed_attributes: WildcardSetting(NotSet), searchable_attributes: WildcardSetting(NotSet), filterable_attributes: NotSet, sortable_attributes: NotSet, ranking_rules: NotSet, stop_words: NotSet, non_separator_tokens: NotSet, separator_tokens: NotSet, dictionary: NotSet, synonyms: NotSet, distinct_attribute: NotSet, proximity_precision: NotSet, typo_tolerance: NotSet, faceting: NotSet, pagination: NotSet, embedders: Set({"A_fakerest": Set(EmbeddingSettings { source: Set(Rest), model: NotSet, revision: NotSet, api_key: Set("My super secret"), dimensions: Set(384), binary_quantized: NotSet, document_template: NotSet, document_template_max_bytes: NotSet, url: Set("http://localhost:7777"), request: Set(String("{{text}}")), response: Set(String("{{embedding}}")), headers: NotSet, distribution: NotSet }), "B_small_hf": Set(EmbeddingSettings { source: Set(HuggingFace), model: Set("sentence-transformers/all-MiniLM-L6-v2"), revision: Set("e4ce9877abf3edfe10b0d82785e83bdcb973e22e"), api_key: NotSet, dimensions: NotSet, binary_quantized: NotSet, document_template: Set("{{doc.doggo}} the {{doc.breed}} best doggo"), document_template_max_bytes: NotSet, url: NotSet, request: NotSet, response: NotSet, headers: NotSet, distribution: NotSet })}), search_cutoff_ms: NotSet, localized_attributes: NotSet, _kind: PhantomData<meilisearch_types::settings::Unchecked> } }, kind: SettingsUpdate { index_uid: "doggos", new_settings: Settings { displayed_attributes: WildcardSetting(NotSet), searchable_attributes: WildcardSetting(NotSet), filterable_attributes: NotSet, sortable_attributes: NotSet, ranking_rules: NotSet, stop_words: NotSet, non_separator_tokens: NotSet, separator_tokens: NotSet, dictionary: NotSet, synonyms: NotSet, distinct_attribute: NotSet, proximity_precision: NotSet, typo_tolerance: NotSet, faceting: NotSet, pagination: NotSet, embedders: Set({"A_fakerest": Set(EmbeddingSettings { source: Set(Rest), model: NotSet, revision: NotSet, api_key: Set("My super secret"), dimensions: Set(384), binary_quantized: NotSet, document_template: NotSet, document_template_max_bytes: NotSet, url: Set("http://localhost:7777"), request: Set(String("{{text}}")), response: Set(String("{{embedding}}")), headers: NotSet, distribution: NotSet }), "B_small_hf": Set(EmbeddingSettings { source: Set(HuggingFace), model: Set("sentence-transformers/all-MiniLM-L6-v2"), revision: Set("e4ce9877abf3edfe10b0d82785e83bdcb973e22e"), api_key: NotSet, dimensions: NotSet, binary_quantized: NotSet, document_template: Set("{{doc.doggo}} the {{doc.breed}} best doggo"), document_template_max_bytes: NotSet, url: NotSet, request: NotSet, response: NotSet, headers: NotSet, distribution: NotSet })}), search_cutoff_ms: NotSet, localized_attributes: NotSet, _kind: PhantomData<meilisearch_types::settings::Unchecked> }, is_deletion: false, allow_index_creation: true }}
+0 {uid: 0, status: succeeded, details: { settings: Settings { displayed_attributes: WildcardSetting(NotSet), searchable_attributes: WildcardSetting(NotSet), filterable_attributes: NotSet, sortable_attributes: NotSet, ranking_rules: NotSet, stop_words: NotSet, non_separator_tokens: NotSet, separator_tokens: NotSet, dictionary: NotSet, synonyms: NotSet, distinct_attribute: NotSet, proximity_precision: NotSet, typo_tolerance: NotSet, faceting: NotSet, pagination: NotSet, embedders: Set({"A_fakerest": Set(EmbeddingSettings { source: Set(Rest), model: NotSet, revision: NotSet, api_key: Set("My super secret"), dimensions: Set(384), document_template: NotSet, url: Set("http://localhost:7777"), query: NotSet, input_field: NotSet, path_to_embeddings: NotSet, embedding_object: NotSet, input_type: NotSet, distribution: NotSet }), "B_small_hf": Set(EmbeddingSettings { source: Set(HuggingFace), model: Set("sentence-transformers/all-MiniLM-L6-v2"), revision: Set("e4ce9877abf3edfe10b0d82785e83bdcb973e22e"), api_key: NotSet, dimensions: NotSet, document_template: Set("{{doc.doggo}} the {{doc.breed}} best doggo"), url: NotSet, query: NotSet, input_field: NotSet, path_to_embeddings: NotSet, embedding_object: NotSet, input_type: NotSet, distribution: NotSet })}), search_cutoff_ms: NotSet, _kind: PhantomData<meilisearch_types::settings::Unchecked> } }, kind: SettingsUpdate { index_uid: "doggos", new_settings: Settings { displayed_attributes: WildcardSetting(NotSet), searchable_attributes: WildcardSetting(NotSet), filterable_attributes: NotSet, sortable_attributes: NotSet, ranking_rules: NotSet, stop_words: NotSet, non_separator_tokens: NotSet, separator_tokens: NotSet, dictionary: NotSet, synonyms: NotSet, distinct_attribute: NotSet, proximity_precision: NotSet, typo_tolerance: NotSet, faceting: NotSet, pagination: NotSet, embedders: Set({"A_fakerest": Set(EmbeddingSettings { source: Set(Rest), model: NotSet, revision: NotSet, api_key: Set("My super secret"), dimensions: Set(384), document_template: NotSet, url: Set("http://localhost:7777"), query: NotSet, input_field: NotSet, path_to_embeddings: NotSet, embedding_object: NotSet, input_type: NotSet, distribution: NotSet }), "B_small_hf": Set(EmbeddingSettings { source: Set(HuggingFace), model: Set("sentence-transformers/all-MiniLM-L6-v2"), revision: Set("e4ce9877abf3edfe10b0d82785e83bdcb973e22e"), api_key: NotSet, dimensions: NotSet, document_template: Set("{{doc.doggo}} the {{doc.breed}} best doggo"), url: NotSet, query: NotSet, input_field: NotSet, path_to_embeddings: NotSet, embedding_object: NotSet, input_type: NotSet, distribution: NotSet })}), search_cutoff_ms: NotSet, _kind: PhantomData<meilisearch_types::settings::Unchecked> }, is_deletion: false, allow_index_creation: true }}
 ----------------------------------------------------------------------
 ### Status:
 enqueued []
@@ -37,3 +37,4 @@ doggos: { number_of_documents: 0, field_distribution: {} }
 ### File Store:

 ----------------------------------------------------------------------
+
--- a/index-scheduler/src/snapshots/lib.rs/test_settings_update/after_registering_settings_task.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_settings_update/after_registering_settings_task.snap
@@ -6,7 +6,7 @@ source: index-scheduler/src/lib.rs
 []
 ----------------------------------------------------------------------
 ### All Tasks:
-0 {uid: 0, status: enqueued, details: { settings: Settings { displayed_attributes: WildcardSetting(NotSet), searchable_attributes: WildcardSetting(NotSet), filterable_attributes: NotSet, sortable_attributes: NotSet, ranking_rules: NotSet, stop_words: NotSet, non_separator_tokens: NotSet, separator_tokens: NotSet, dictionary: NotSet, synonyms: NotSet, distinct_attribute: NotSet, proximity_precision: NotSet, typo_tolerance: NotSet, faceting: NotSet, pagination: NotSet, embedders: Set({"default": Set(EmbeddingSettings { source: Set(Rest), model: NotSet, revision: NotSet, api_key: Set("My super secret"), dimensions: Set(4), binary_quantized: NotSet, document_template: NotSet, document_template_max_bytes: NotSet, url: Set("http://localhost:7777"), request: Set(String("{{text}}")), response: Set(String("{{embedding}}")), headers: NotSet, distribution: NotSet })}), search_cutoff_ms: NotSet, localized_attributes: NotSet, _kind: PhantomData<meilisearch_types::settings::Unchecked> } }, kind: SettingsUpdate { index_uid: "doggos", new_settings: Settings { displayed_attributes: WildcardSetting(NotSet), searchable_attributes: WildcardSetting(NotSet), filterable_attributes: NotSet, sortable_attributes: NotSet, ranking_rules: NotSet, stop_words: NotSet, non_separator_tokens: NotSet, separator_tokens: NotSet, dictionary: NotSet, synonyms: NotSet, distinct_attribute: NotSet, proximity_precision: NotSet, typo_tolerance: NotSet, faceting: NotSet, pagination: NotSet, embedders: Set({"default": Set(EmbeddingSettings { source: Set(Rest), model: NotSet, revision: NotSet, api_key: Set("My super secret"), dimensions: Set(4), binary_quantized: NotSet, document_template: NotSet, document_template_max_bytes: NotSet, url: Set("http://localhost:7777"), request: Set(String("{{text}}")), response: Set(String("{{embedding}}")), headers: NotSet, distribution: NotSet })}), search_cutoff_ms: NotSet, localized_attributes: NotSet, _kind: PhantomData<meilisearch_types::settings::Unchecked> }, is_deletion: false, allow_index_creation: true }}
+0 {uid: 0, status: enqueued, details: { settings: Settings { displayed_attributes: WildcardSetting(NotSet), searchable_attributes: WildcardSetting(NotSet), filterable_attributes: NotSet, sortable_attributes: NotSet, ranking_rules: NotSet, stop_words: NotSet, non_separator_tokens: NotSet, separator_tokens: NotSet, dictionary: NotSet, synonyms: NotSet, distinct_attribute: NotSet, proximity_precision: NotSet, typo_tolerance: NotSet, faceting: NotSet, pagination: NotSet, embedders: Set({"default": Set(EmbeddingSettings { source: Set(Rest), model: NotSet, revision: NotSet, api_key: Set("My super secret"), dimensions: Set(4), document_template: NotSet, url: Set("http://localhost:7777"), query: NotSet, input_field: NotSet, path_to_embeddings: NotSet, embedding_object: NotSet, input_type: NotSet, distribution: NotSet })}), search_cutoff_ms: NotSet, _kind: PhantomData<meilisearch_types::settings::Unchecked> } }, kind: SettingsUpdate { index_uid: "doggos", new_settings: Settings { displayed_attributes: WildcardSetting(NotSet), searchable_attributes: WildcardSetting(NotSet), filterable_attributes: NotSet, sortable_attributes: NotSet, ranking_rules: NotSet, stop_words: NotSet, non_separator_tokens: NotSet, separator_tokens: NotSet, dictionary: NotSet, synonyms: NotSet, distinct_attribute: NotSet, proximity_precision: NotSet, typo_tolerance: NotSet, faceting: NotSet, pagination: NotSet, embedders: Set({"default": Set(EmbeddingSettings { source: Set(Rest), model: NotSet, revision: NotSet, api_key: Set("My super secret"), dimensions: Set(4), document_template: NotSet, url: Set("http://localhost:7777"), query: NotSet, input_field: NotSet, path_to_embeddings: NotSet, embedding_object: NotSet, input_type: NotSet, distribution: NotSet })}), search_cutoff_ms: NotSet, _kind: PhantomData<meilisearch_types::settings::Unchecked> }, is_deletion: false, allow_index_creation: true }}
 ----------------------------------------------------------------------
 ### Status:
 enqueued [0,]
@@ -33,3 +33,4 @@ doggos [0,]
 ### File Store:

 ----------------------------------------------------------------------
+
--- a/index-scheduler/src/snapshots/lib.rs/test_settings_update/settings_update_processed.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_settings_update/settings_update_processed.snap
@@ -6,7 +6,7 @@ source: index-scheduler/src/lib.rs
 []
 ----------------------------------------------------------------------
 ### All Tasks:
-0 {uid: 0, status: succeeded, details: { settings: Settings { displayed_attributes: WildcardSetting(NotSet), searchable_attributes: WildcardSetting(NotSet), filterable_attributes: NotSet, sortable_attributes: NotSet, ranking_rules: NotSet, stop_words: NotSet, non_separator_tokens: NotSet, separator_tokens: NotSet, dictionary: NotSet, synonyms: NotSet, distinct_attribute: NotSet, proximity_precision: NotSet, typo_tolerance: NotSet, faceting: NotSet, pagination: NotSet, embedders: Set({"default": Set(EmbeddingSettings { source: Set(Rest), model: NotSet, revision: NotSet, api_key: Set("My super secret"), dimensions: Set(4), binary_quantized: NotSet, document_template: NotSet, document_template_max_bytes: NotSet, url: Set("http://localhost:7777"), request: Set(String("{{text}}")), response: Set(String("{{embedding}}")), headers: NotSet, distribution: NotSet })}), search_cutoff_ms: NotSet, localized_attributes: NotSet, _kind: PhantomData<meilisearch_types::settings::Unchecked> } }, kind: SettingsUpdate { index_uid: "doggos", new_settings: Settings { displayed_attributes: WildcardSetting(NotSet), searchable_attributes: WildcardSetting(NotSet), filterable_attributes: NotSet, sortable_attributes: NotSet, ranking_rules: NotSet, stop_words: NotSet, non_separator_tokens: NotSet, separator_tokens: NotSet, dictionary: NotSet, synonyms: NotSet, distinct_attribute: NotSet, proximity_precision: NotSet, typo_tolerance: NotSet, faceting: NotSet, pagination: NotSet, embedders: Set({"default": Set(EmbeddingSettings { source: Set(Rest), model: NotSet, revision: NotSet, api_key: Set("My super secret"), dimensions: Set(4), binary_quantized: NotSet, document_template: NotSet, document_template_max_bytes: NotSet, url: Set("http://localhost:7777"), request: Set(String("{{text}}")), response: Set(String("{{embedding}}")), headers: NotSet, distribution: NotSet })}), search_cutoff_ms: NotSet, localized_attributes: NotSet, _kind: PhantomData<meilisearch_types::settings::Unchecked> }, is_deletion: false, allow_index_creation: true }}
+0 {uid: 0, status: succeeded, details: { settings: Settings { displayed_attributes: WildcardSetting(NotSet), searchable_attributes: WildcardSetting(NotSet), filterable_attributes: NotSet, sortable_attributes: NotSet, ranking_rules: NotSet, stop_words: NotSet, non_separator_tokens: NotSet, separator_tokens: NotSet, dictionary: NotSet, synonyms: NotSet, distinct_attribute: NotSet, proximity_precision: NotSet, typo_tolerance: NotSet, faceting: NotSet, pagination: NotSet, embedders: Set({"default": Set(EmbeddingSettings { source: Set(Rest), model: NotSet, revision: NotSet, api_key: Set("My super secret"), dimensions: Set(4), document_template: NotSet, url: Set("http://localhost:7777"), query: NotSet, input_field: NotSet, path_to_embeddings: NotSet, embedding_object: NotSet, input_type: NotSet, distribution: NotSet })}), search_cutoff_ms: NotSet, _kind: PhantomData<meilisearch_types::settings::Unchecked> } }, kind: SettingsUpdate { index_uid: "doggos", new_settings: Settings { displayed_attributes: WildcardSetting(NotSet), searchable_attributes: WildcardSetting(NotSet), filterable_attributes: NotSet, sortable_attributes: NotSet, ranking_rules: NotSet, stop_words: NotSet, non_separator_tokens: NotSet, separator_tokens: NotSet, dictionary: NotSet, synonyms: NotSet, distinct_attribute: NotSet, proximity_precision: NotSet, typo_tolerance: NotSet, faceting: NotSet, pagination: NotSet, embedders: Set({"default": Set(EmbeddingSettings { source: Set(Rest), model: NotSet, revision: NotSet, api_key: Set("My super secret"), dimensions: Set(4), document_template: NotSet, url: Set("http://localhost:7777"), query: NotSet, input_field: NotSet, path_to_embeddings: NotSet, embedding_object: NotSet, input_type: NotSet, distribution: NotSet })}), search_cutoff_ms: NotSet, _kind: PhantomData<meilisearch_types::settings::Unchecked> }, is_deletion: false, allow_index_creation: true }}
 ----------------------------------------------------------------------
 ### Status:
 enqueued []
@@ -37,3 +37,4 @@ doggos: { number_of_documents: 0, field_distribution: {} }
 ### File Store:

 ----------------------------------------------------------------------
+
--- a/meilisearch-types/Cargo.toml
+++ b/meilisearch-types/Cargo.toml
@@ -66,5 +66,3 @@ khmer = ["milli/khmer"]
 vietnamese = ["milli/vietnamese"]
 # force swedish character recomposition
 swedish-recomposition = ["milli/swedish-recomposition"]
-# force german character recomposition
-german = ["milli/german"]
--- a/meilisearch-types/src/document_formats.rs
+++ b/meilisearch-types/src/document_formats.rs
@@ -1,22 +1,20 @@
 use std::fmt::{self, Debug, Display};
 use std::fs::File;
-use std::io::{self, BufWriter};
+use std::io::{self, BufWriter, Write};
 use std::marker::PhantomData;

-use memmap2::Mmap;
-use milli::documents::Error;
-use milli::update::new::TopLevelMap;
+use memmap2::MmapOptions;
+use milli::documents::{DocumentsBatchBuilder, Error};
 use milli::Object;
 use serde::de::{SeqAccess, Visitor};
 use serde::{Deserialize, Deserializer};
 use serde_json::error::Category;
-use serde_json::{to_writer, Map, Value};

 use crate::error::{Code, ErrorCode};

 type Result<T> = std::result::Result<T, DocumentFormatError>;

-#[derive(Debug, Clone, Copy)]
+#[derive(Debug)]
 pub enum PayloadType {
    Ndjson,
    Json,
@@ -90,26 +88,6 @@ impl From<(PayloadType, Error)> for DocumentFormatError {
    }
 }

-impl From<(PayloadType, serde_json::Error)> for DocumentFormatError {
-    fn from((ty, error): (PayloadType, serde_json::Error)) -> Self {
-        if error.classify() == Category::Data {
-            Self::Io(error.into())
-        } else {
-            Self::MalformedPayload(Error::Json(error), ty)
-        }
-    }
-}
-
-impl From<(PayloadType, csv::Error)> for DocumentFormatError {
-    fn from((ty, error): (PayloadType, csv::Error)) -> Self {
-        if error.is_io_error() {
-            Self::Io(error.into())
-        } else {
-            Self::MalformedPayload(Error::Csv(error), ty)
-        }
-    }
-}
-
 impl From<io::Error> for DocumentFormatError {
    fn from(error: io::Error) -> Self {
        Self::Io(error)
@@ -125,140 +103,67 @@ impl ErrorCode for DocumentFormatError {
    }
 }

-// TODO remove that from the place I've borrowed it
-#[derive(Debug)]
-enum AllowedType {
-    String,
-    Boolean,
-    Number,
+/// Reads CSV from input and write an obkv batch to writer.
+pub fn read_csv(file: &File, writer: impl Write, delimiter: u8) -> Result<u64> {
+    let mut builder = DocumentsBatchBuilder::new(BufWriter::new(writer));
+    let mmap = unsafe { MmapOptions::new().map(file)? };
+    let csv = csv::ReaderBuilder::new().delimiter(delimiter).from_reader(mmap.as_ref());
+    builder.append_csv(csv).map_err(|e| (PayloadType::Csv { delimiter }, e))?;
+
+    let count = builder.documents_count();
+    let _ = builder.into_inner().map_err(DocumentFormatError::Io)?;
+
+    Ok(count as u64)
 }

-fn parse_csv_header(header: &str) -> (&str, AllowedType) {
-    // if there are several separators we only split on the last one.
-    match header.rsplit_once(':') {
-        Some((field_name, field_type)) => match field_type {
-            "string" => (field_name, AllowedType::String),
-            "boolean" => (field_name, AllowedType::Boolean),
-            "number" => (field_name, AllowedType::Number),
-            // if the pattern isn't recognized, we keep the whole field.
-            _otherwise => (header, AllowedType::String),
-        },
-        None => (header, AllowedType::String),
-    }
-}
+/// Reads JSON from temporary file and write an obkv batch to writer.
+pub fn read_json(file: &File, writer: impl Write) -> Result<u64> {
+    let mut builder = DocumentsBatchBuilder::new(BufWriter::new(writer));
+    let mmap = unsafe { MmapOptions::new().map(file)? };
+    let mut deserializer = serde_json::Deserializer::from_slice(&mmap);

-/// Reads CSV from file and write it in NDJSON in a file checking it along the way.
-pub fn read_csv(input: &File, output: impl io::Write, delimiter: u8) -> Result<u64> {
-    let ptype = PayloadType::Csv { delimiter };
-    let mut output = BufWriter::new(output);
-    let mut reader = csv::ReaderBuilder::new().delimiter(delimiter).from_reader(input);
-
-    let headers = reader.headers().map_err(|e| DocumentFormatError::from((ptype, e)))?.clone();
-    let typed_fields: Vec<_> = headers.iter().map(parse_csv_header).collect();
-    let mut object: Map<_, _> =
-        typed_fields.iter().map(|(k, _)| (k.to_string(), Value::Null)).collect();
-
-    let mut line = 0;
-    let mut record = csv::StringRecord::new();
-    while reader.read_record(&mut record).map_err(|e| DocumentFormatError::from((ptype, e)))? {
-        // We increment here and not at the end of the loop
-        // to take the header offset into account.
-        line += 1;
-
-        // Reset the document values
-        object.iter_mut().for_each(|(_, v)| *v = Value::Null);
-
-        for (i, (name, atype)) in typed_fields.iter().enumerate() {
-            let value = &record[i];
-            let trimmed_value = value.trim();
-            let value = match atype {
-                AllowedType::Number if trimmed_value.is_empty() => Value::Null,
-                AllowedType::Number => match trimmed_value.parse::<i64>() {
-                    Ok(integer) => Value::from(integer),
-                    Err(_) => match trimmed_value.parse::<f64>() {
-                        Ok(float) => Value::from(float),
-                        Err(error) => {
-                            return Err(DocumentFormatError::MalformedPayload(
-                                Error::ParseFloat { error, line, value: value.to_string() },
-                                ptype,
-                            ))
-                        }
-                    },
-                },
-                AllowedType::Boolean if trimmed_value.is_empty() => Value::Null,
-                AllowedType::Boolean => match trimmed_value.parse::<bool>() {
-                    Ok(bool) => Value::from(bool),
-                    Err(error) => {
-                        return Err(DocumentFormatError::MalformedPayload(
-                            Error::ParseBool { error, line, value: value.to_string() },
-                            ptype,
-                        ))
-                    }
-                },
-                AllowedType::String if value.is_empty() => Value::Null,
-                AllowedType::String => Value::from(value),
-            };
-
-            *object.get_mut(*name).expect("encountered an unknown field") = value;
-        }
-
-        to_writer(&mut output, &object).map_err(|e| DocumentFormatError::from((ptype, e)))?;
-    }
-
-    Ok(line as u64)
-}
-
-/// Reads JSON from file and write it in NDJSON in a file checking it along the way.
-pub fn read_json(input: &File, output: impl io::Write) -> Result<u64> {
-    // We memory map to be able to deserailize into a TopLevelMap<'pl> that
-    // does not allocate when possible and only materialize the first/top level.
-    let input = unsafe { Mmap::map(input).map_err(DocumentFormatError::Io)? };
-
-    let mut out = BufWriter::new(output);
-    let mut deserializer = serde_json::Deserializer::from_slice(&input);
-    let count = match array_each(&mut deserializer, |obj: TopLevelMap| to_writer(&mut out, &obj)) {
+    match array_each(&mut deserializer, |obj| builder.append_json_object(&obj)) {
        // The json data has been deserialized and does not need to be processed again.
        // The data has been transferred to the writer during the deserialization process.
-        Ok(Ok(count)) => count,
-        Ok(Err(e)) => return Err(DocumentFormatError::from((PayloadType::Json, e))),
+        Ok(Ok(_)) => (),
+        Ok(Err(e)) => return Err(DocumentFormatError::Io(e)),
        Err(e) => {
            // Attempt to deserialize a single json string when the cause of the exception is not Category.data
            // Other types of deserialisation exceptions are returned directly to the front-end
-            if e.classify() != Category::Data {
-                return Err(DocumentFormatError::from((PayloadType::Json, e)));
+            if e.classify() != serde_json::error::Category::Data {
+                return Err(DocumentFormatError::MalformedPayload(
+                    Error::Json(e),
+                    PayloadType::Json,
+                ));
            }

-            let content: Object = serde_json::from_slice(&input)
+            let content: Object = serde_json::from_slice(&mmap)
                .map_err(Error::Json)
                .map_err(|e| (PayloadType::Json, e))?;
-            to_writer(&mut out, &content)
-                .map(|_| 1)
-                .map_err(|e| DocumentFormatError::from((PayloadType::Json, e)))?
+            builder.append_json_object(&content).map_err(DocumentFormatError::Io)?;
        }
-    };
-
-    match out.into_inner() {
-        Ok(_) => Ok(count),
-        Err(ie) => Err(DocumentFormatError::Io(ie.into_error())),
    }
+
+    let count = builder.documents_count();
+    let _ = builder.into_inner().map_err(DocumentFormatError::Io)?;
+
+    Ok(count as u64)
 }

-/// Reads NDJSON from file and write it in NDJSON in a file checking it along the way.
-pub fn read_ndjson(input: &File, output: impl io::Write) -> Result<u64> {
-    // We memory map to be able to deserailize into a TopLevelMap<'pl> that
-    // does not allocate when possible and only materialize the first/top level.
-    let input = unsafe { Mmap::map(input).map_err(DocumentFormatError::Io)? };
-    let mut output = BufWriter::new(output);
+/// Reads JSON from temporary file  and write an obkv batch to writer.
+pub fn read_ndjson(file: &File, writer: impl Write) -> Result<u64> {
+    let mut builder = DocumentsBatchBuilder::new(BufWriter::new(writer));
+    let mmap = unsafe { MmapOptions::new().map(file)? };

-    let mut count = 0;
-    for result in serde_json::Deserializer::from_slice(&input).into_iter() {
-        count += 1;
-        result
-            .and_then(|map: TopLevelMap| to_writer(&mut output, &map))
-            .map_err(|e| DocumentFormatError::from((PayloadType::Ndjson, e)))?;
+    for result in serde_json::Deserializer::from_slice(&mmap).into_iter() {
+        let object = result.map_err(Error::Json).map_err(|e| (PayloadType::Ndjson, e))?;
+        builder.append_json_object(&object).map_err(Into::into).map_err(DocumentFormatError::Io)?;
    }

-    Ok(count)
+    let count = builder.documents_count();
+    let _ = builder.into_inner().map_err(Into::into).map_err(DocumentFormatError::Io)?;
+
+    Ok(count as u64)
 }

 /// The actual handling of the deserialization process in serde
@@ -267,23 +172,20 @@ pub fn read_ndjson(input: &File, output: impl io::Write) -> Result<u64> {
 /// ## References
 /// <https://serde.rs/stream-array.html>
 /// <https://github.com/serde-rs/json/issues/160>
-fn array_each<'de, D, T, F>(
-    deserializer: D,
-    f: F,
-) -> std::result::Result<serde_json::Result<u64>, D::Error>
+fn array_each<'de, D, T, F>(deserializer: D, f: F) -> std::result::Result<io::Result<u64>, D::Error>
 where
    D: Deserializer<'de>,
    T: Deserialize<'de>,
-    F: FnMut(T) -> serde_json::Result<()>,
+    F: FnMut(T) -> io::Result<()>,
 {
    struct SeqVisitor<T, F>(F, PhantomData<T>);

    impl<'de, T, F> Visitor<'de> for SeqVisitor<T, F>
    where
        T: Deserialize<'de>,
-        F: FnMut(T) -> serde_json::Result<()>,
+        F: FnMut(T) -> io::Result<()>,
    {
-        type Value = serde_json::Result<u64>;
+        type Value = io::Result<u64>;

        fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
            formatter.write_str("a nonempty sequence")
@@ -292,7 +194,7 @@ where
        fn visit_seq<A>(
            mut self,
            mut seq: A,
-        ) -> std::result::Result<serde_json::Result<u64>, <A as SeqAccess<'de>>::Error>
+        ) -> std::result::Result<io::Result<u64>, <A as SeqAccess<'de>>::Error>
        where
            A: SeqAccess<'de>,
        {
@@ -301,7 +203,7 @@ where
                match self.0(value) {
                    Ok(()) => max += 1,
                    Err(e) => return Ok(Err(e)),
-                }
+                };
            }
            Ok(Ok(max))
        }
--- a/meilisearch-types/src/error.rs
+++ b/meilisearch-types/src/error.rs
@@ -238,14 +238,8 @@ InvalidIndexLimit                     , InvalidRequest       , BAD_REQUEST ;
 InvalidIndexOffset                    , InvalidRequest       , BAD_REQUEST ;
 InvalidIndexPrimaryKey                , InvalidRequest       , BAD_REQUEST ;
 InvalidIndexUid                       , InvalidRequest       , BAD_REQUEST ;
-InvalidMultiSearchFacets              , InvalidRequest       , BAD_REQUEST ;
-InvalidMultiSearchFacetsByIndex       , InvalidRequest       , BAD_REQUEST ;
-InvalidMultiSearchFacetOrder          , InvalidRequest       , BAD_REQUEST ;
 InvalidMultiSearchFederated           , InvalidRequest       , BAD_REQUEST ;
 InvalidMultiSearchFederationOptions   , InvalidRequest       , BAD_REQUEST ;
-InvalidMultiSearchMaxValuesPerFacet   , InvalidRequest       , BAD_REQUEST ;
-InvalidMultiSearchMergeFacets         , InvalidRequest       , BAD_REQUEST ;
-InvalidMultiSearchQueryFacets         , InvalidRequest       , BAD_REQUEST ;
 InvalidMultiSearchQueryPagination     , InvalidRequest       , BAD_REQUEST ;
 InvalidMultiSearchQueryRankingRules   , InvalidRequest       , BAD_REQUEST ;
 InvalidMultiSearchWeight              , InvalidRequest       , BAD_REQUEST ;
@@ -262,7 +256,6 @@ InvalidSearchCropLength               , InvalidRequest       , BAD_REQUEST ;
 InvalidSearchCropMarker               , InvalidRequest       , BAD_REQUEST ;
 InvalidSearchFacets                   , InvalidRequest       , BAD_REQUEST ;
 InvalidSearchSemanticRatio            , InvalidRequest       , BAD_REQUEST ;
-InvalidSearchLocales                  , InvalidRequest       , BAD_REQUEST ;
 InvalidFacetSearchFacetName           , InvalidRequest       , BAD_REQUEST ;
 InvalidSimilarId                      , InvalidRequest       , BAD_REQUEST ;
 InvalidSearchFilter                   , InvalidRequest       , BAD_REQUEST ;
@@ -304,7 +297,6 @@ InvalidSettingsSeparatorTokens        , InvalidRequest       , BAD_REQUEST ;
 InvalidSettingsDictionary             , InvalidRequest       , BAD_REQUEST ;
 InvalidSettingsSynonyms               , InvalidRequest       , BAD_REQUEST ;
 InvalidSettingsTypoTolerance          , InvalidRequest       , BAD_REQUEST ;
-InvalidSettingsLocalizedAttributes    , InvalidRequest       , BAD_REQUEST ;
 InvalidState                          , Internal             , INTERNAL_SERVER_ERROR ;
 InvalidStoreFile                      , Internal             , INTERNAL_SERVER_ERROR ;
 InvalidSwapDuplicateIndexFound        , InvalidRequest       , BAD_REQUEST ;
@@ -394,11 +386,7 @@ impl ErrorCode for milli::Error {
                    | UserError::InvalidOpenAiModelDimensionsMax { .. }
                    | UserError::InvalidSettingsDimensions { .. }
                    | UserError::InvalidUrl { .. }
-                    | UserError::InvalidSettingsDocumentTemplateMaxBytes { .. }
-                    | UserError::InvalidPrompt(_)
-                    | UserError::InvalidDisableBinaryQuantization { .. } => {
-                        Code::InvalidSettingsEmbedders
-                    }
+                    | UserError::InvalidPrompt(_) => Code::InvalidSettingsEmbedders,
                    UserError::TooManyEmbedders(_) => Code::InvalidSettingsEmbedders,
                    UserError::InvalidPromptForEmbeddings(..) => Code::InvalidSettingsEmbedders,
                    UserError::NoPrimaryKeyCandidateFound => Code::IndexPrimaryKeyNoCandidateFound,
--- a/meilisearch-types/src/index_uid.rs
+++ b/meilisearch-types/src/index_uid.rs
@@ -1,4 +1,3 @@
-use std::borrow::Borrow;
 use std::error::Error;
 use std::fmt;
 use std::str::FromStr;
@@ -9,7 +8,7 @@ use crate::error::{Code, ErrorCode};

 /// An index uid is composed of only ascii alphanumeric characters, - and _, between 1 and 400
 /// bytes long
-#[derive(Debug, Clone, PartialEq, Eq, Deserr, PartialOrd, Ord)]
+#[derive(Debug, Clone, PartialEq, Eq, Deserr)]
 #[deserr(try_from(String) = IndexUid::try_from -> IndexUidFormatError)]
 pub struct IndexUid(String);

@@ -71,12 +70,6 @@ impl From<IndexUid> for String {
    }
 }

-impl Borrow<String> for IndexUid {
-    fn borrow(&self) -> &String {
-        &self.0
-    }
-}
-
 #[derive(Debug)]
 pub struct IndexUidFormatError {
    pub invalid_uid: String,
--- a/meilisearch-types/src/lib.rs
+++ b/meilisearch-types/src/lib.rs
@@ -7,7 +7,6 @@ pub mod features;
 pub mod index_uid;
 pub mod index_uid_pattern;
 pub mod keys;
-pub mod locales;
 pub mod settings;
 pub mod star_or;
 pub mod task_view;
--- a/meilisearch-types/src/locales.rs
+++ b/meilisearch-types/src/locales.rs
@@ -1,166 +0,0 @@
-use deserr::Deserr;
-use milli::LocalizedAttributesRule;
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, Clone, PartialEq, Eq, Deserr, Serialize, Deserialize)]
-#[deserr(rename_all = camelCase)]
-#[serde(rename_all = "camelCase")]
-pub struct LocalizedAttributesRuleView {
-    pub attribute_patterns: Vec<String>,
-    pub locales: Vec<Locale>,
-}
-
-impl From<LocalizedAttributesRule> for LocalizedAttributesRuleView {
-    fn from(rule: LocalizedAttributesRule) -> Self {
-        Self {
-            attribute_patterns: rule.attribute_patterns,
-            locales: rule.locales.into_iter().map(|l| l.into()).collect(),
-        }
-    }
-}
-
-impl From<LocalizedAttributesRuleView> for LocalizedAttributesRule {
-    fn from(view: LocalizedAttributesRuleView) -> Self {
-        Self {
-            attribute_patterns: view.attribute_patterns,
-            locales: view.locales.into_iter().map(|l| l.into()).collect(),
-        }
-    }
-}
-
-/// Generate a Locale enum and its From and Into implementations for milli::tokenizer::Language.
-///
-/// this enum implements `Deserr` in order to be used in the API.
-macro_rules! make_locale {
-    ($(($iso_639_1:ident, $iso_639_1_str:expr) => ($iso_639_3:ident, $iso_639_3_str:expr),)+) => {
-        #[derive(Debug, Copy, Clone, PartialEq, Eq, Deserr, Serialize, Deserialize, Ord, PartialOrd)]
-        #[deserr(rename_all = camelCase)]
-        #[serde(rename_all = "camelCase")]
-        pub enum Locale {
-            $($iso_639_1,)+
-            $($iso_639_3,)+
-            Cmn,
-        }
-
-        impl From<milli::tokenizer::Language> for Locale {
-            fn from(other: milli::tokenizer::Language) -> Locale {
-                match other {
-                    $(milli::tokenizer::Language::$iso_639_3 => Locale::$iso_639_3,)+
-                    milli::tokenizer::Language::Cmn => Locale::Cmn,
-                }
-            }
-        }
-
-        impl From<Locale> for milli::tokenizer::Language {
-            fn from(other: Locale) -> milli::tokenizer::Language {
-                match other {
-                    $(Locale::$iso_639_1 => milli::tokenizer::Language::$iso_639_3,)+
-                    $(Locale::$iso_639_3 => milli::tokenizer::Language::$iso_639_3,)+
-                    Locale::Cmn => milli::tokenizer::Language::Cmn,
-                }
-            }
-        }
-
-        impl std::str::FromStr for Locale {
-            type Err = LocaleFormatError;
-
-            fn from_str(s: &str) -> Result<Self, Self::Err> {
-                let locale = match s {
-                    $($iso_639_1_str => Locale::$iso_639_1,)+
-                    $($iso_639_3_str => Locale::$iso_639_3,)+
-                    "cmn" => Locale::Cmn,
-                    _ => return Err(LocaleFormatError { invalid_locale: s.to_string() }),
-                };
-
-                Ok(locale)
-            }
-        }
-
-        #[derive(Debug)]
-        pub struct LocaleFormatError {
-            pub invalid_locale: String,
-        }
-
-        impl std::fmt::Display for LocaleFormatError {
-            fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-                let mut valid_locales = [$($iso_639_1_str),+,$($iso_639_3_str),+,"cmn"];
-                valid_locales.sort_by(|left, right| left.len().cmp(&right.len()).then(left.cmp(right)));
-                write!(f, "Unsupported locale `{}`, expected one of {}", self.invalid_locale, valid_locales.join(", "))
-            }
-        }
-
-        impl std::error::Error for LocaleFormatError {}
-    };
-}
-
-make_locale!(
-    (Af, "af") => (Afr, "afr"),
-    (Ak, "ak") => (Aka, "aka"),
-    (Am, "am") => (Amh, "amh"),
-    (Ar, "ar") => (Ara, "ara"),
-    (Az, "az") => (Aze, "aze"),
-    (Be, "be") => (Bel, "bel"),
-    (Bn, "bn") => (Ben, "ben"),
-    (Bg, "bg") => (Bul, "bul"),
-    (Ca, "ca") => (Cat, "cat"),
-    (Cs, "cs") => (Ces, "ces"),
-    (Da, "da") => (Dan, "dan"),
-    (De, "de") => (Deu, "deu"),
-    (El, "el") => (Ell, "ell"),
-    (En, "en") => (Eng, "eng"),
-    (Eo, "eo") => (Epo, "epo"),
-    (Et, "et") => (Est, "est"),
-    (Fi, "fi") => (Fin, "fin"),
-    (Fr, "fr") => (Fra, "fra"),
-    (Gu, "gu") => (Guj, "guj"),
-    (He, "he") => (Heb, "heb"),
-    (Hi, "hi") => (Hin, "hin"),
-    (Hr, "hr") => (Hrv, "hrv"),
-    (Hu, "hu") => (Hun, "hun"),
-    (Hy, "hy") => (Hye, "hye"),
-    (Id, "id") => (Ind, "ind"),
-    (It, "it") => (Ita, "ita"),
-    (Jv, "jv") => (Jav, "jav"),
-    (Ja, "ja") => (Jpn, "jpn"),
-    (Kn, "kn") => (Kan, "kan"),
-    (Ka, "ka") => (Kat, "kat"),
-    (Km, "km") => (Khm, "khm"),
-    (Ko, "ko") => (Kor, "kor"),
-    (La, "la") => (Lat, "lat"),
-    (Lv, "lv") => (Lav, "lav"),
-    (Lt, "lt") => (Lit, "lit"),
-    (Ml, "ml") => (Mal, "mal"),
-    (Mr, "mr") => (Mar, "mar"),
-    (Mk, "mk") => (Mkd, "mkd"),
-    (My, "my") => (Mya, "mya"),
-    (Ne, "ne") => (Nep, "nep"),
-    (Nl, "nl") => (Nld, "nld"),
-    (Nb, "nb") => (Nob, "nob"),
-    (Or, "or") => (Ori, "ori"),
-    (Pa, "pa") => (Pan, "pan"),
-    (Fa, "fa") => (Pes, "pes"),
-    (Pl, "pl") => (Pol, "pol"),
-    (Pt, "pt") => (Por, "por"),
-    (Ro, "ro") => (Ron, "ron"),
-    (Ru, "ru") => (Rus, "rus"),
-    (Si, "si") => (Sin, "sin"),
-    (Sk, "sk") => (Slk, "slk"),
-    (Sl, "sl") => (Slv, "slv"),
-    (Sn, "sn") => (Sna, "sna"),
-    (Es, "es") => (Spa, "spa"),
-    (Sr, "sr") => (Srp, "srp"),
-    (Sv, "sv") => (Swe, "swe"),
-    (Ta, "ta") => (Tam, "tam"),
-    (Te, "te") => (Tel, "tel"),
-    (Tl, "tl") => (Tgl, "tgl"),
-    (Th, "th") => (Tha, "tha"),
-    (Tk, "tk") => (Tuk, "tuk"),
-    (Tr, "tr") => (Tur, "tur"),
-    (Uk, "uk") => (Ukr, "ukr"),
-    (Ur, "ur") => (Urd, "urd"),
-    (Uz, "uz") => (Uzb, "uzb"),
-    (Vi, "vi") => (Vie, "vie"),
-    (Yi, "yi") => (Yid, "yid"),
-    (Zh, "zh") => (Zho, "zho"),
-    (Zu, "zu") => (Zul, "zul"),
-);
--- a/meilisearch-types/src/settings.rs
+++ b/meilisearch-types/src/settings.rs
@@ -17,7 +17,6 @@ use serde::{Deserialize, Serialize, Serializer};
 use crate::deserr::DeserrJsonError;
 use crate::error::deserr_codes::*;
 use crate::facet_values_sort::FacetValuesSort;
-use crate::locales::LocalizedAttributesRuleView;

 /// The maximum number of results that the engine
 /// will be able to return in one search call.
@@ -199,9 +198,6 @@ pub struct Settings<T> {
    #[serde(default, skip_serializing_if = "Setting::is_not_set")]
    #[deserr(default, error = DeserrJsonError<InvalidSettingsSearchCutoffMs>)]
    pub search_cutoff_ms: Setting<u64>,
-    #[serde(default, skip_serializing_if = "Setting::is_not_set")]
-    #[deserr(default, error = DeserrJsonError<InvalidSettingsLocalizedAttributes>)]
-    pub localized_attributes: Setting<Vec<LocalizedAttributesRuleView>>,

    #[serde(skip)]
    #[deserr(skip)]
@@ -265,7 +261,6 @@ impl Settings<Checked> {
            pagination: Setting::Reset,
            embedders: Setting::Reset,
            search_cutoff_ms: Setting::Reset,
-            localized_attributes: Setting::Reset,
            _kind: PhantomData,
        }
    }
@@ -289,8 +284,7 @@ impl Settings<Checked> {
            pagination,
            embedders,
            search_cutoff_ms,
-            localized_attributes: localized_attributes_rules,
-            _kind,
+            ..
        } = self;

        Settings {
@@ -311,7 +305,6 @@ impl Settings<Checked> {
            pagination,
            embedders,
            search_cutoff_ms,
-            localized_attributes: localized_attributes_rules,
            _kind: PhantomData,
        }
    }
@@ -359,7 +352,6 @@ impl Settings<Unchecked> {
            pagination: self.pagination,
            embedders: self.embedders,
            search_cutoff_ms: self.search_cutoff_ms,
-            localized_attributes: self.localized_attributes,
            _kind: PhantomData,
        }
    }
@@ -410,7 +402,6 @@ pub fn apply_settings_to_builder(
        pagination,
        embedders,
        search_cutoff_ms,
-        localized_attributes: localized_attributes_rules,
        _kind,
    } = settings;

@@ -494,13 +485,6 @@ pub fn apply_settings_to_builder(
        Setting::NotSet => (),
    }

-    match localized_attributes_rules {
-        Setting::Set(ref rules) => builder
-            .set_localized_attributes_rules(rules.iter().cloned().map(|r| r.into()).collect()),
-        Setting::Reset => builder.reset_localized_attributes_rules(),
-        Setting::NotSet => (),
-    }
-
    match typo_tolerance {
        Setting::Set(ref value) => {
            match value.enabled {
@@ -695,8 +679,6 @@ pub fn settings(

    let search_cutoff_ms = index.search_cutoff(rtxn)?;

-    let localized_attributes_rules = index.localized_attributes_rules(rtxn)?;
-
    let mut settings = Settings {
        displayed_attributes: match displayed_attributes {
            Some(attrs) => Setting::Set(attrs),
@@ -729,10 +711,6 @@ pub fn settings(
            Some(cutoff) => Setting::Set(cutoff),
            None => Setting::Reset,
        },
-        localized_attributes: match localized_attributes_rules {
-            Some(rules) => Setting::Set(rules.into_iter().map(|r| r.into()).collect()),
-            None => Setting::Reset,
-        },
        _kind: PhantomData,
    };

@@ -924,7 +902,6 @@ pub(crate) mod test {
            faceting: Setting::NotSet,
            pagination: Setting::NotSet,
            embedders: Setting::NotSet,
-            localized_attributes: Setting::NotSet,
            search_cutoff_ms: Setting::NotSet,
            _kind: PhantomData::<Unchecked>,
        };
@@ -953,7 +930,6 @@ pub(crate) mod test {
            faceting: Setting::NotSet,
            pagination: Setting::NotSet,
            embedders: Setting::NotSet,
-            localized_attributes: Setting::NotSet,
            search_cutoff_ms: Setting::NotSet,
            _kind: PhantomData::<Unchecked>,
        };
--- a/meilisearch-types/src/versioning.rs
+++ b/meilisearch-types/src/versioning.rs
@@ -10,50 +10,36 @@ static VERSION_MINOR: &str = env!("CARGO_PKG_VERSION_MINOR");
 static VERSION_PATCH: &str = env!("CARGO_PKG_VERSION_PATCH");

 /// Persists the version of the current Meilisearch binary to a VERSION file
-pub fn create_current_version_file(db_path: &Path) -> io::Result<()> {
-    create_version_file(db_path, VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH)
-}
-
-pub fn create_version_file(
-    db_path: &Path,
-    major: &str,
-    minor: &str,
-    patch: &str,
-) -> io::Result<()> {
+pub fn create_version_file(db_path: &Path) -> io::Result<()> {
    let version_path = db_path.join(VERSION_FILE_NAME);
-    fs::write(version_path, format!("{}.{}.{}", major, minor, patch))
+    fs::write(version_path, format!("{}.{}.{}", VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH))
 }

 /// Ensures Meilisearch version is compatible with the database, returns an error versions mismatch.
 pub fn check_version_file(db_path: &Path) -> anyhow::Result<()> {
-    let (major, minor, patch) = get_version(db_path)?;
-
-    if major != VERSION_MAJOR || minor != VERSION_MINOR {
-        return Err(VersionFileError::VersionMismatch { major, minor, patch }.into());
-    }
-
-    Ok(())
-}
-
-pub fn get_version(db_path: &Path) -> Result<(String, String, String), VersionFileError> {
    let version_path = db_path.join(VERSION_FILE_NAME);

    match fs::read_to_string(version_path) {
-        Ok(version) => parse_version(&version),
-        Err(error) => match error.kind() {
-            ErrorKind::NotFound => Err(VersionFileError::MissingVersionFile),
-            _ => Err(error.into()),
-        },
-    }
-}
+        Ok(version) => {
+            let version_components = version.split('.').collect::<Vec<_>>();
+            let (major, minor, patch) = match &version_components[..] {
+                [major, minor, patch] => (major.to_string(), minor.to_string(), patch.to_string()),
+                _ => return Err(VersionFileError::MalformedVersionFile.into()),
+            };

-pub fn parse_version(version: &str) -> Result<(String, String, String), VersionFileError> {
-    let version_components = version.split('.').collect::<Vec<_>>();
-    let (major, minor, patch) = match &version_components[..] {
-        [major, minor, patch] => (major.to_string(), minor.to_string(), patch.to_string()),
-        _ => return Err(VersionFileError::MalformedVersionFile),
-    };
-    Ok((major, minor, patch))
+            if major != VERSION_MAJOR || minor != VERSION_MINOR {
+                return Err(VersionFileError::VersionMismatch { major, minor, patch }.into());
+            }
+        }
+        Err(error) => {
+            return match error.kind() {
+                ErrorKind::NotFound => Err(VersionFileError::MissingVersionFile.into()),
+                _ => Err(error.into()),
+            }
+        }
+    }
+
+    Ok(())
 }

 #[derive(thiserror::Error, Debug)]
@@ -72,7 +58,4 @@ pub enum VersionFileError {
        env!("CARGO_PKG_VERSION").to_string()
    )]
    VersionMismatch { major: String, minor: String, patch: String },
-
-    #[error(transparent)]
-    IoError(#[from] std::io::Error),
 }
--- a/meilisearch/Cargo.toml
+++ b/meilisearch/Cargo.toml
@@ -57,7 +57,7 @@ meilisearch-types = { path = "../meilisearch-types" }
 mimalloc = { version = "0.1.43", default-features = false }
 mime = "0.3.17"
 num_cpus = "1.16.0"
-obkv = { git = "https://github.com/kerollmops/obkv", branch = "unsized-kvreader" }
+obkv = "0.2.2"
 once_cell = "1.19.0"
 ordered-float = "4.2.1"
 parking_lot = "0.12.3"
@@ -114,7 +114,6 @@ maplit = "1.0.2"
 meili-snap = { path = "../meili-snap" }
 temp-env = "0.3.6"
 urlencoding = "2.1.3"
-wiremock = "0.6.0"
 yaup = "0.3.1"

 [build-dependencies]
@@ -153,7 +152,6 @@ greek = ["meilisearch-types/greek"]
 khmer = ["meilisearch-types/khmer"]
 vietnamese = ["meilisearch-types/vietnamese"]
 swedish-recomposition = ["meilisearch-types/swedish-recomposition"]
-german = ["meilisearch-types/german"]

 [package.metadata.mini-dashboard]
 assets-url = "https://github.com/meilisearch/mini-dashboard/releases/download/v0.2.14/build.zip"
--- a/meilisearch/src/analytics/segment_analytics.rs
+++ b/meilisearch/src/analytics/segment_analytics.rs
@@ -1,4 +1,4 @@
-use std::collections::{BTreeSet, BinaryHeap, HashMap, HashSet};
+use std::collections::{BinaryHeap, HashMap, HashSet};
 use std::fs;
 use std::mem::take;
 use std::path::{Path, PathBuf};
@@ -10,7 +10,6 @@ use actix_web::HttpRequest;
 use byte_unit::Byte;
 use index_scheduler::IndexScheduler;
 use meilisearch_auth::{AuthController, AuthFilter};
-use meilisearch_types::locales::Locale;
 use meilisearch_types::InstanceUid;
 use once_cell::sync::Lazy;
 use regex::Regex;
@@ -646,15 +645,14 @@ pub struct SearchAggregator {
    max_vector_size: usize,
    // Whether the semantic ratio passed to a hybrid search equals the default ratio.
    semantic_ratio: bool,
+    // Whether a non-default embedder was specified
+    embedder: bool,
    hybrid: bool,
    retrieve_vectors: bool,

    // every time a search is done, we increment the counter linked to the used settings
    matching_strategy: HashMap<String, usize>,

-    // List of the unique Locales passed as parameter
-    locales: BTreeSet<Locale>,
-
    // pagination
    max_limit: usize,
    max_offset: usize,
@@ -709,7 +707,6 @@ impl SearchAggregator {
            attributes_to_search_on,
            hybrid,
            ranking_score_threshold,
-            locales,
        } = query;

        let mut ret = Self::default();
@@ -777,10 +774,6 @@ impl SearchAggregator {

        ret.matching_strategy.insert(format!("{:?}", matching_strategy), 1);

-        if let Some(locales) = locales {
-            ret.locales = locales.iter().copied().collect();
-        }
-
        ret.highlight_pre_tag = *highlight_pre_tag != DEFAULT_HIGHLIGHT_PRE_TAG();
        ret.highlight_post_tag = *highlight_post_tag != DEFAULT_HIGHLIGHT_POST_TAG();
        ret.crop_marker = *crop_marker != DEFAULT_CROP_MARKER();
@@ -793,6 +786,7 @@ impl SearchAggregator {

        if let Some(hybrid) = hybrid {
            ret.semantic_ratio = hybrid.semantic_ratio != DEFAULT_SEMANTIC_RATIO();
+            ret.embedder = hybrid.embedder.is_some();
            ret.hybrid = true;
        }

@@ -860,11 +854,11 @@ impl SearchAggregator {
            show_ranking_score,
            show_ranking_score_details,
            semantic_ratio,
+            embedder,
            hybrid,
            total_degraded,
            total_used_negative_operator,
            ranking_score_threshold,
-            ref mut locales,
        } = other;

        if self.timestamp.is_none() {
@@ -919,6 +913,7 @@ impl SearchAggregator {
        self.retrieve_vectors |= retrieve_vectors;
        self.semantic_ratio |= semantic_ratio;
        self.hybrid |= hybrid;
+        self.embedder |= embedder;

        // pagination
        self.max_limit = self.max_limit.max(max_limit);
@@ -952,9 +947,6 @@ impl SearchAggregator {
        self.show_ranking_score |= show_ranking_score;
        self.show_ranking_score_details |= show_ranking_score_details;
        self.ranking_score_threshold |= ranking_score_threshold;
-
-        // locales
-        self.locales.append(locales);
    }

    pub fn into_event(self, user: &User, event_name: &str) -> Option<Track> {
@@ -994,11 +986,11 @@ impl SearchAggregator {
            show_ranking_score,
            show_ranking_score_details,
            semantic_ratio,
+            embedder,
            hybrid,
            total_degraded,
            total_used_negative_operator,
            ranking_score_threshold,
-            locales,
        } = self;

        if total_received == 0 {
@@ -1045,6 +1037,7 @@ impl SearchAggregator {
                "hybrid": {
                    "enabled": hybrid,
                    "semantic_ratio": semantic_ratio,
+                    "embedder": embedder,
                },
                "pagination": {
                   "max_limit": max_limit,
@@ -1067,7 +1060,6 @@ impl SearchAggregator {
                "matching_strategy": {
                    "most_used_strategy": matching_strategy.iter().max_by_key(|(_, v)| *v).map(|(k, _)| json!(k)).unwrap_or_else(|| json!(null)),
                },
-                "locales": locales,
                "scoring": {
                    "show_ranking_score": show_ranking_score,
                    "show_ranking_score_details": show_ranking_score_details,
@@ -1158,7 +1150,6 @@ impl MultiSearchAggregator {
                    attributes_to_search_on: _,
                    hybrid: _,
                    ranking_score_threshold: _,
-                    locales: _,
                } = query;

                index_uid.as_str()
@@ -1316,7 +1307,6 @@ impl FacetSearchAggregator {
            attributes_to_search_on,
            hybrid,
            ranking_score_threshold,
-            locales,
        } = query;

        let mut ret = Self::default();
@@ -1332,8 +1322,7 @@ impl FacetSearchAggregator {
            || *matching_strategy != MatchingStrategy::default()
            || attributes_to_search_on.is_some()
            || hybrid.is_some()
-            || ranking_score_threshold.is_some()
-            || locales.is_some();
+            || ranking_score_threshold.is_some();

        ret
    }
@@ -1775,6 +1764,7 @@ pub struct SimilarAggregator {
    used_syntax: HashMap<String, usize>,

    // Whether a non-default embedder was specified
+    embedder: bool,
    retrieve_vectors: bool,

    // pagination
@@ -1795,7 +1785,7 @@ impl SimilarAggregator {
    pub fn from_query(query: &SimilarQuery, request: &HttpRequest) -> Self {
        let SimilarQuery {
            id: _,
-            embedder: _,
+            embedder,
            offset,
            limit,
            attributes_to_retrieve: _,
@@ -1843,6 +1833,7 @@ impl SimilarAggregator {
        ret.show_ranking_score_details = *show_ranking_score_details;
        ret.ranking_score_threshold = ranking_score_threshold.is_some();

+        ret.embedder = embedder.is_some();
        ret.retrieve_vectors = *retrieve_vectors;

        ret
@@ -1874,6 +1865,7 @@ impl SimilarAggregator {
            max_attributes_to_retrieve,
            show_ranking_score,
            show_ranking_score_details,
+            embedder,
            ranking_score_threshold,
            retrieve_vectors,
        } = other;
@@ -1904,6 +1896,7 @@ impl SimilarAggregator {
            *used_syntax = used_syntax.saturating_add(value);
        }

+        self.embedder |= embedder;
        self.retrieve_vectors |= retrieve_vectors;

        // pagination
@@ -1937,6 +1930,7 @@ impl SimilarAggregator {
            max_attributes_to_retrieve,
            show_ranking_score,
            show_ranking_score_details,
+            embedder,
            ranking_score_threshold,
            retrieve_vectors,
        } = self;
@@ -1968,6 +1962,9 @@ impl SimilarAggregator {
                "vector": {
                    "retrieve_vectors": retrieve_vectors,
                },
+                "hybrid": {
+                    "embedder": embedder,
+                },
                "pagination": {
                   "max_limit": max_limit,
                   "max_offset": max_offset,
--- a/meilisearch/src/error.rs
+++ b/meilisearch/src/error.rs
@@ -4,7 +4,6 @@ use byte_unit::{Byte, UnitType};
 use meilisearch_types::document_formats::{DocumentFormatError, PayloadType};
 use meilisearch_types::error::{Code, ErrorCode, ResponseError};
 use meilisearch_types::index_uid::{IndexUid, IndexUidFormatError};
-use meilisearch_types::milli::OrderBy;
 use serde_json::Value;
 use tokio::task::JoinError;

@@ -28,20 +27,10 @@ pub enum MeilisearchHttpError {
    EmptyFilter,
    #[error("Invalid syntax for the filter parameter: `expected {}, found: {1}`.", .0.join(", "))]
    InvalidExpression(&'static [&'static str], Value),
-    #[error("Using `federationOptions` is not allowed in a non-federated search.\n - Hint: remove `federationOptions` from query #{0} or add `federation` to the request.")]
+    #[error("Using `federationOptions` is not allowed in a non-federated search.\n Hint: remove `federationOptions` from query #{0} or add `federation: {{}}` to the request.")]
    FederationOptionsInNonFederatedRequest(usize),
-    #[error("Inside `.queries[{0}]`: Using pagination options is not allowed in federated queries.\n - Hint: remove `{1}` from query #{0} or remove `federation` from the request\n - Hint: pass `federation.limit` and `federation.offset` for pagination in federated search")]
+    #[error("Inside `.queries[{0}]`: Using pagination options is not allowed in federated queries.\n Hint: remove `{1}` from query #{0} or remove `federation: {{}}` from the request")]
    PaginationInFederatedQuery(usize, &'static str),
-    #[error("Inside `.queries[{0}]`: Using facet options is not allowed in federated queries.\n - Hint: remove `facets` from query #{0} or remove `federation` from the request\n - Hint: pass `federation.facetsByIndex.{1}: {2:?}` for facets in federated search")]
-    FacetsInFederatedQuery(usize, String, Vec<String>),
-    #[error("Inconsistent order for values in facet `{facet}`: index `{previous_uid}` orders {previous_facet_order}, but index `{current_uid}` orders {index_facet_order}.\n - Hint: Remove `federation.mergeFacets` or change `faceting.sortFacetValuesBy` to be consistent in settings.")]
-    InconsistentFacetOrder {
-        facet: String,
-        previous_facet_order: OrderBy,
-        previous_uid: String,
-        index_facet_order: OrderBy,
-        current_uid: String,
-    },
    #[error("A {0} payload is missing.")]
    MissingPayload(PayloadType),
    #[error("Too many search requests running at the same time: {0}. Retry after 10s.")]
@@ -72,7 +61,7 @@ pub enum MeilisearchHttpError {
    DocumentFormat(#[from] DocumentFormatError),
    #[error(transparent)]
    Join(#[from] JoinError),
-    #[error("Invalid request: missing `hybrid` parameter when `vector` is present.")]
+    #[error("Invalid request: missing `hybrid` parameter when both `q` and `vector` are present.")]
    MissingSearchHybrid,
 }

@@ -107,10 +96,6 @@ impl ErrorCode for MeilisearchHttpError {
            MeilisearchHttpError::PaginationInFederatedQuery(_, _) => {
                Code::InvalidMultiSearchQueryPagination
            }
-            MeilisearchHttpError::FacetsInFederatedQuery(..) => Code::InvalidMultiSearchQueryFacets,
-            MeilisearchHttpError::InconsistentFacetOrder { .. } => {
-                Code::InvalidMultiSearchFacetOrder
-            }
        }
    }
 }
--- a/meilisearch/src/lib.rs
+++ b/meilisearch/src/lib.rs
@@ -13,10 +13,11 @@ pub mod search_queue;

 use std::fs::File;
 use std::io::{BufReader, BufWriter};
+use std::num::NonZeroUsize;
 use std::path::Path;
 use std::str::FromStr;
 use std::sync::Arc;
-use std::thread;
+use std::thread::{self, available_parallelism};
 use std::time::Duration;

 use actix_cors::Cors;
@@ -36,7 +37,7 @@ use meilisearch_types::milli::documents::{DocumentsBatchBuilder, DocumentsBatchR
 use meilisearch_types::milli::update::{IndexDocumentsConfig, IndexDocumentsMethod};
 use meilisearch_types::settings::apply_settings_to_builder;
 use meilisearch_types::tasks::KindWithContent;
-use meilisearch_types::versioning::{check_version_file, create_current_version_file};
+use meilisearch_types::versioning::{check_version_file, create_version_file};
 use meilisearch_types::{compression, milli, VERSION_FILE_NAME};
 pub use option::Opt;
 use option::ScheduleSnapshot;
@@ -117,7 +118,6 @@ pub type LogStderrType = tracing_subscriber::filter::Filtered<
 pub fn create_app(
    index_scheduler: Data<IndexScheduler>,
    auth_controller: Data<AuthController>,
-    search_queue: Data<SearchQueue>,
    opt: Opt,
    logs: (LogRouteHandle, LogStderrHandle),
    analytics: Arc<dyn Analytics>,
@@ -137,7 +137,6 @@ pub fn create_app(
                s,
                index_scheduler.clone(),
                auth_controller.clone(),
-                search_queue.clone(),
                &opt,
                logs,
                analytics.clone(),
@@ -319,7 +318,7 @@ fn open_or_create_database_unchecked(
    match (
        index_scheduler_builder(),
        auth_controller.map_err(anyhow::Error::from),
-        create_current_version_file(&opt.db_path).map_err(anyhow::Error::from),
+        create_version_file(&opt.db_path).map_err(anyhow::Error::from),
    ) {
        (Ok(i), Ok(a), Ok(())) => Ok((i, a)),
        (Err(e), _, _) | (_, Err(e), _) | (_, _, Err(e)) => {
@@ -470,16 +469,19 @@ pub fn configure_data(
    config: &mut web::ServiceConfig,
    index_scheduler: Data<IndexScheduler>,
    auth: Data<AuthController>,
-    search_queue: Data<SearchQueue>,
    opt: &Opt,
    (logs_route, logs_stderr): (LogRouteHandle, LogStderrHandle),
    analytics: Arc<dyn Analytics>,
 ) {
+    let search_queue = SearchQueue::new(
+        opt.experimental_search_queue_size,
+        available_parallelism().unwrap_or(NonZeroUsize::new(2).unwrap()),
+    );
    let http_payload_size_limit = opt.http_payload_size_limit.as_u64() as usize;
    config
        .app_data(index_scheduler)
        .app_data(auth)
-        .app_data(search_queue)
+        .app_data(web::Data::new(search_queue))
        .app_data(web::Data::from(analytics))
        .app_data(web::Data::new(logs_route))
        .app_data(web::Data::new(logs_stderr))
--- a/meilisearch/src/main.rs
+++ b/meilisearch/src/main.rs
@@ -1,10 +1,8 @@
 use std::env;
 use std::io::{stderr, LineWriter, Write};
-use std::num::NonZeroUsize;
 use std::path::PathBuf;
 use std::str::FromStr;
 use std::sync::Arc;
-use std::thread::available_parallelism;

 use actix_web::http::KeepAlive;
 use actix_web::web::Data;
@@ -13,7 +11,6 @@ use index_scheduler::IndexScheduler;
 use is_terminal::IsTerminal;
 use meilisearch::analytics::Analytics;
 use meilisearch::option::LogMode;
-use meilisearch::search_queue::SearchQueue;
 use meilisearch::{
    analytics, create_app, setup_meilisearch, LogRouteHandle, LogRouteType, LogStderrHandle,
    LogStderrType, Opt, SubscriberForSecondLayer,
@@ -75,19 +72,6 @@ fn on_panic(info: &std::panic::PanicInfo) {

 #[actix_web::main]
 async fn main() -> anyhow::Result<()> {
-    try_main().await.inspect_err(|error| {
-        tracing::error!(%error);
-        let mut current = error.source();
-        let mut depth = 0;
-        while let Some(source) = current {
-            tracing::info!(%source, depth, "Error caused by");
-            current = source.source();
-            depth += 1;
-        }
-    })
-}
-
-async fn try_main() -> anyhow::Result<()> {
    let (opt, config_read_from) = Opt::try_build()?;

    std::panic::set_hook(Box::new(on_panic));
@@ -151,17 +135,11 @@ async fn run_http(
    let opt_clone = opt.clone();
    let index_scheduler = Data::from(index_scheduler);
    let auth_controller = Data::from(auth_controller);
-    let search_queue = SearchQueue::new(
-        opt.experimental_search_queue_size,
-        available_parallelism().unwrap_or(NonZeroUsize::new(2).unwrap()),
-    );
-    let search_queue = Data::new(search_queue);

    let http_server = HttpServer::new(move || {
        create_app(
            index_scheduler.clone(),
            auth_controller.clone(),
-            search_queue.clone(),
            opt.clone(),
            logs.clone(),
            analytics.clone(),
--- a/meilisearch/src/middleware.rs
+++ b/meilisearch/src/middleware.rs
@@ -55,17 +55,16 @@ where
        let index_scheduler = req.app_data::<Data<IndexScheduler>>().unwrap();
        let features = index_scheduler.features();

-        let request_path = req.path();
-        let request_pattern = req.match_pattern();
-        let metric_path = request_pattern.as_ref().map_or(request_path, String::as_str).to_string();
-        let request_method = req.method().to_string();
-
        if features.check_metrics().is_ok() {
+            let request_path = req.path();
            let is_registered_resource = req.resource_map().has_resource(request_path);
            if is_registered_resource {
+                let request_pattern = req.match_pattern();
+                let metric_path = request_pattern.as_ref().map_or(request_path, String::as_str);
+                let request_method = req.method().to_string();
                histogram_timer = Some(
                    crate::metrics::MEILISEARCH_HTTP_RESPONSE_TIME_SECONDS
-                        .with_label_values(&[&request_method, &metric_path])
+                        .with_label_values(&[&request_method, metric_path])
                        .start_timer(),
                );
            }
@@ -77,7 +76,11 @@ where
            let res = fut.await?;

            crate::metrics::MEILISEARCH_HTTP_REQUESTS_TOTAL
-                .with_label_values(&[&request_method, &metric_path, res.status().as_str()])
+                .with_label_values(&[
+                    res.request().method().as_str(),
+                    res.request().path(),
+                    res.status().as_str(),
+                ])
                .inc();

            if let Some(histogram_timer) = histogram_timer {
--- a/meilisearch/src/routes/indexes/facet_search.rs
+++ b/meilisearch/src/routes/indexes/facet_search.rs
@@ -6,7 +6,6 @@ use meilisearch_types::deserr::DeserrJsonError;
 use meilisearch_types::error::deserr_codes::*;
 use meilisearch_types::error::ResponseError;
 use meilisearch_types::index_uid::IndexUid;
-use meilisearch_types::locales::Locale;
 use serde_json::Value;
 use tracing::debug;

@@ -49,8 +48,6 @@ pub struct FacetSearchQuery {
    pub attributes_to_search_on: Option<Vec<String>>,
    #[deserr(default, error = DeserrJsonError<InvalidSearchRankingScoreThreshold>, default)]
    pub ranking_score_threshold: Option<RankingScoreThreshold>,
-    #[deserr(default, error = DeserrJsonError<InvalidSearchLocales>, default)]
-    pub locales: Option<Vec<Locale>>,
 }

 pub async fn search(
@@ -70,7 +67,6 @@ pub async fn search(

    let facet_query = query.facet_query.clone();
    let facet_name = query.facet_name.clone();
-    let locales = query.locales.clone().map(|l| l.into_iter().map(Into::into).collect());
    let mut search_query = SearchQuery::from(query);

    // Tenant token search_rules.
@@ -81,7 +77,7 @@ pub async fn search(
    let index = index_scheduler.index(&index_uid)?;
    let features = index_scheduler.features();
    let search_kind = search_kind(&search_query, &index_scheduler, &index, features)?;
-    let permit = search_queue.try_get_search_permit().await?;
+    let _permit = search_queue.try_get_search_permit().await?;
    let search_result = tokio::task::spawn_blocking(move || {
        perform_facet_search(
            &index,
@@ -90,12 +86,9 @@ pub async fn search(
            facet_name,
            search_kind,
            index_scheduler.features(),
-            locales,
        )
    })
-    .await;
-    permit.drop().await;
-    let search_result = search_result?;
+    .await?;

    if let Ok(ref search_result) = search_result {
        aggregate.succeed(search_result);
@@ -120,7 +113,6 @@ impl From<FacetSearchQuery> for SearchQuery {
            attributes_to_search_on,
            hybrid,
            ranking_score_threshold,
-            locales,
        } = value;

        SearchQuery {
@@ -149,7 +141,6 @@ impl From<FacetSearchQuery> for SearchQuery {
            attributes_to_search_on,
            hybrid,
            ranking_score_threshold,
-            locales,
        }
    }
 }
--- a/meilisearch/src/routes/indexes/search.rs
+++ b/meilisearch/src/routes/indexes/search.rs
@@ -7,7 +7,6 @@ use meilisearch_types::deserr::{DeserrJsonError, DeserrQueryParamError};
 use meilisearch_types::error::deserr_codes::*;
 use meilisearch_types::error::ResponseError;
 use meilisearch_types::index_uid::IndexUid;
-use meilisearch_types::locales::Locale;
 use meilisearch_types::milli;
 use meilisearch_types::serde_cs::vec::CS;
 use serde_json::Value;
@@ -90,8 +89,6 @@ pub struct SearchQueryGet {
    pub hybrid_semantic_ratio: Option<SemanticRatioGet>,
    #[deserr(default, error = DeserrQueryParamError<InvalidSearchRankingScoreThreshold>)]
    pub ranking_score_threshold: Option<RankingScoreThresholdGet>,
-    #[deserr(default, error = DeserrQueryParamError<InvalidSearchLocales>)]
-    pub locales: Option<CS<Locale>>,
 }

 #[derive(Debug, Clone, Copy, PartialEq, deserr::Deserr)]
@@ -128,10 +125,8 @@ impl std::ops::Deref for SemanticRatioGet {
    }
 }

-impl TryFrom<SearchQueryGet> for SearchQuery {
-    type Error = ResponseError;
-
-    fn try_from(other: SearchQueryGet) -> Result<Self, Self::Error> {
+impl From<SearchQueryGet> for SearchQuery {
+    fn from(other: SearchQueryGet) -> Self {
        let filter = match other.filter {
            Some(f) => match serde_json::from_str(&f) {
                Ok(v) => Some(v),
@@ -142,28 +137,19 @@ impl TryFrom<SearchQueryGet> for SearchQuery {

        let hybrid = match (other.hybrid_embedder, other.hybrid_semantic_ratio) {
            (None, None) => None,
-            (None, Some(_)) => {
-                return Err(ResponseError::from_msg(
-                    "`hybridEmbedder` is mandatory when `hybridSemanticRatio` is present".into(),
-                    meilisearch_types::error::Code::InvalidHybridQuery,
-                ));
-            }
-            (Some(embedder), None) => {
-                Some(HybridQuery { semantic_ratio: DEFAULT_SEMANTIC_RATIO(), embedder })
+            (None, Some(semantic_ratio)) => {
+                Some(HybridQuery { semantic_ratio: *semantic_ratio, embedder: None })
            }
+            (Some(embedder), None) => Some(HybridQuery {
+                semantic_ratio: DEFAULT_SEMANTIC_RATIO(),
+                embedder: Some(embedder),
+            }),
            (Some(embedder), Some(semantic_ratio)) => {
-                Some(HybridQuery { semantic_ratio: *semantic_ratio, embedder })
+                Some(HybridQuery { semantic_ratio: *semantic_ratio, embedder: Some(embedder) })
            }
        };

-        if other.vector.is_some() && hybrid.is_none() {
-            return Err(ResponseError::from_msg(
-                "`hybridEmbedder` is mandatory when `vector` is present".into(),
-                meilisearch_types::error::Code::MissingSearchHybrid,
-            ));
-        }
-
-        Ok(Self {
+        Self {
            q: other.q,
            vector: other.vector.map(CS::into_inner),
            offset: other.offset.0,
@@ -189,8 +175,7 @@ impl TryFrom<SearchQueryGet> for SearchQuery {
            attributes_to_search_on: other.attributes_to_search_on.map(|o| o.into_iter().collect()),
            hybrid,
            ranking_score_threshold: other.ranking_score_threshold.map(|o| o.0),
-            locales: other.locales.map(|o| o.into_iter().collect()),
-        })
+        }
    }
 }

@@ -230,7 +215,7 @@ pub async fn search_with_url_query(
    debug!(parameters = ?params, "Search get");
    let index_uid = IndexUid::try_from(index_uid.into_inner())?;

-    let mut query: SearchQuery = params.into_inner().try_into()?;
+    let mut query: SearchQuery = params.into_inner().into();

    // Tenant token search_rules.
    if let Some(search_rules) = index_scheduler.filters().get_index_search_rules(&index_uid) {
@@ -244,13 +229,11 @@ pub async fn search_with_url_query(

    let search_kind = search_kind(&query, index_scheduler.get_ref(), &index, features)?;
    let retrieve_vector = RetrieveVectors::new(query.retrieve_vectors, features)?;
-    let permit = search_queue.try_get_search_permit().await?;
+    let _permit = search_queue.try_get_search_permit().await?;
    let search_result = tokio::task::spawn_blocking(move || {
        perform_search(&index, query, search_kind, retrieve_vector, index_scheduler.features())
    })
-    .await;
-    permit.drop().await;
-    let search_result = search_result?;
+    .await?;
    if let Ok(ref search_result) = search_result {
        aggregate.succeed(search_result);
    }
@@ -289,13 +272,11 @@ pub async fn search_with_post(
    let search_kind = search_kind(&query, index_scheduler.get_ref(), &index, features)?;
    let retrieve_vectors = RetrieveVectors::new(query.retrieve_vectors, features)?;

-    let permit = search_queue.try_get_search_permit().await?;
+    let _permit = search_queue.try_get_search_permit().await?;
    let search_result = tokio::task::spawn_blocking(move || {
        perform_search(&index, query, search_kind, retrieve_vectors, index_scheduler.features())
    })
-    .await;
-    permit.drop().await;
-    let search_result = search_result?;
+    .await?;
    if let Ok(ref search_result) = search_result {
        aggregate.succeed(search_result);
        if search_result.degraded {
@@ -323,36 +304,44 @@ pub fn search_kind(
        features.check_vector("Passing `hybrid` as a parameter")?;
    }

-    // handle with care, the order of cases matters, the semantics is subtle
-    match (query.q.as_deref(), &query.hybrid, query.vector.as_deref()) {
-        // empty query, no vector => placeholder search
-        (Some(q), _, None) if q.trim().is_empty() => Ok(SearchKind::KeywordOnly),
-        // no query, no vector => placeholder search
-        (None, _, None) => Ok(SearchKind::KeywordOnly),
-        // hybrid.semantic_ratio == 1.0 => vector
-        (_, Some(HybridQuery { semantic_ratio, embedder }), v) if **semantic_ratio == 1.0 => {
-            SearchKind::semantic(index_scheduler, index, embedder, v.map(|v| v.len()))
+    // regardless of anything, always do a keyword search when we don't have a vector and the query is whitespace or missing
+    if query.vector.is_none() {
+        match &query.q {
+            Some(q) if q.trim().is_empty() => return Ok(SearchKind::KeywordOnly),
+            None => return Ok(SearchKind::KeywordOnly),
+            _ => {}
        }
-        // hybrid.semantic_ratio == 0.0 => keyword
-        (_, Some(HybridQuery { semantic_ratio, embedder: _ }), _) if **semantic_ratio == 0.0 => {
+    }
+
+    match &query.hybrid {
+        Some(HybridQuery { semantic_ratio, embedder }) if **semantic_ratio == 1.0 => {
+            Ok(SearchKind::semantic(
+                index_scheduler,
+                index,
+                embedder.as_deref(),
+                query.vector.as_ref().map(Vec::len),
+            )?)
+        }
+        Some(HybridQuery { semantic_ratio, embedder: _ }) if **semantic_ratio == 0.0 => {
            Ok(SearchKind::KeywordOnly)
        }
-        // no query, hybrid, vector => semantic
-        (None, Some(HybridQuery { semantic_ratio: _, embedder }), Some(v)) => {
-            SearchKind::semantic(index_scheduler, index, embedder, Some(v.len()))
-        }
-        // query, no hybrid, no vector => keyword
-        (Some(_), None, None) => Ok(SearchKind::KeywordOnly),
-        // query, hybrid, maybe vector => hybrid
-        (Some(_), Some(HybridQuery { semantic_ratio, embedder }), v) => SearchKind::hybrid(
+        Some(HybridQuery { semantic_ratio, embedder }) => Ok(SearchKind::hybrid(
            index_scheduler,
            index,
-            embedder,
+            embedder.as_deref(),
            **semantic_ratio,
-            v.map(|v| v.len()),
-        ),
-
-        (_, None, Some(_)) => Err(MeilisearchHttpError::MissingSearchHybrid.into()),
+            query.vector.as_ref().map(Vec::len),
+        )?),
+        None => match (query.q.as_deref(), query.vector.as_deref()) {
+            (_query, None) => Ok(SearchKind::KeywordOnly),
+            (None, Some(_vector)) => Ok(SearchKind::semantic(
+                index_scheduler,
+                index,
+                None,
+                query.vector.as_ref().map(Vec::len),
+            )?),
+            (Some(_), Some(_)) => Err(MeilisearchHttpError::MissingSearchHybrid.into()),
+        },
    }
 }

--- a/meilisearch/src/routes/indexes/settings.rs
+++ b/meilisearch/src/routes/indexes/settings.rs
@@ -474,28 +474,6 @@ make_setting_route!(
    }
 );

-make_setting_route!(
-    "/localized-attributes",
-    put,
-    Vec<meilisearch_types::locales::LocalizedAttributesRuleView>,
-    meilisearch_types::deserr::DeserrJsonError<
-        meilisearch_types::error::deserr_codes::InvalidSettingsLocalizedAttributes,
-    >,
-    localized_attributes,
-    "localizedAttributes",
-    analytics,
-    |rules: &Option<Vec<meilisearch_types::locales::LocalizedAttributesRuleView>>, req: &HttpRequest| {
-        use serde_json::json;
-        analytics.publish(
-            "LocalizedAttributesRules Updated".to_string(),
-            json!({
-                "locales": rules.as_ref().map(|rules| rules.iter().flat_map(|rule| rule.locales.iter().cloned()).collect::<std::collections::BTreeSet<_>>())
-            }),
-            Some(req),
-        );
-    }
-);
-
 make_setting_route!(
    "/ranking-rules",
    put,
@@ -636,26 +614,11 @@ fn embedder_analytics(
            .any(|config| config.document_template.set().is_some())
    });

-    let document_template_max_bytes = setting.as_ref().and_then(|map| {
-        map.values()
-            .filter_map(|config| config.clone().set())
-            .filter_map(|config| config.document_template_max_bytes.set())
-            .max()
-    });
-
-    let binary_quantization_used = setting.as_ref().map(|map| {
-        map.values()
-            .filter_map(|config| config.clone().set())
-            .any(|config| config.binary_quantized.set().is_some())
-    });
-
    json!(
        {
            "total": setting.as_ref().map(|s| s.len()),
            "sources": sources,
            "document_template_used": document_template_used,
-            "document_template_max_bytes": document_template_max_bytes,
-            "binary_quantization_used": binary_quantization_used,
        }
    )
 }
@@ -697,7 +660,6 @@ generate_configure!(
    filterable_attributes,
    sortable_attributes,
    displayed_attributes,
-    localized_attributes,
    searchable_attributes,
    distinct_attribute,
    proximity_precision,
@@ -824,7 +786,6 @@ pub async fn update_all(
            },
            "embedders": crate::routes::indexes::settings::embedder_analytics(new_settings.embedders.as_ref().set()),
            "search_cutoff_ms": new_settings.search_cutoff_ms.as_ref().set(),
-            "locales": new_settings.localized_attributes.as_ref().set().map(|rules| rules.iter().flat_map(|rule| rule.locales.iter().cloned()).collect::<std::collections::BTreeSet<_>>()),
        }),
        Some(&req),
    );
--- a/meilisearch/src/routes/indexes/similar.rs
+++ b/meilisearch/src/routes/indexes/similar.rs
@@ -102,8 +102,8 @@ async fn similar(

    let index = index_scheduler.index(&index_uid)?;

-    let (embedder_name, embedder, quantized) =
-        SearchKind::embedder(&index_scheduler, &index, &query.embedder, None)?;
+    let (embedder_name, embedder) =
+        SearchKind::embedder(&index_scheduler, &index, query.embedder.as_deref(), None)?;

    tokio::task::spawn_blocking(move || {
        perform_similar(
@@ -111,7 +111,6 @@ async fn similar(
            query,
            embedder_name,
            embedder,
-            quantized,
            retrieve_vectors,
            index_scheduler.features(),
        )
@@ -140,8 +139,8 @@ pub struct SimilarQueryGet {
    show_ranking_score_details: Param<bool>,
    #[deserr(default, error = DeserrQueryParamError<InvalidSimilarRankingScoreThreshold>, default)]
    pub ranking_score_threshold: Option<RankingScoreThresholdGet>,
-    #[deserr(error = DeserrQueryParamError<InvalidEmbedder>)]
-    pub embedder: String,
+    #[deserr(default, error = DeserrQueryParamError<InvalidEmbedder>)]
+    pub embedder: Option<String>,
 }

 #[derive(Debug, Clone, Copy, PartialEq, deserr::Deserr)]
--- a/meilisearch/src/routes/multi_search.rs
+++ b/meilisearch/src/routes/multi_search.rs
@@ -39,7 +39,7 @@ pub async fn multi_search_with_post(
 ) -> Result<HttpResponse, ResponseError> {
    // Since we don't want to process half of the search requests and then get a permit refused
    // we're going to get one permit for the whole duration of the multi-search request.
-    let permit = search_queue.try_get_search_permit().await?;
+    let _permit = search_queue.try_get_search_permit().await?;

    let federated_search = params.into_inner();

@@ -81,7 +81,6 @@ pub async fn multi_search_with_post(
                perform_federated_search(&index_scheduler, queries, federation, features)
            })
            .await;
-            permit.drop().await;

            if let Ok(Ok(_)) = search_result {
                multi_aggregate.succeed();
@@ -144,7 +143,6 @@ pub async fn multi_search_with_post(
                Ok(search_results)
            }
            .await;
-            permit.drop().await;

            if search_results.is_ok() {
                multi_aggregate.succeed();
--- a/meilisearch/src/search/federated.rs
+++ b/meilisearch/src/search/federated.rs
@@ -9,24 +9,20 @@ use std::vec::{IntoIter, Vec};

 use actix_http::StatusCode;
 use index_scheduler::{IndexScheduler, RoFeatures};
-use indexmap::IndexMap;
 use meilisearch_types::deserr::DeserrJsonError;
 use meilisearch_types::error::deserr_codes::{
-    InvalidMultiSearchFacetsByIndex, InvalidMultiSearchMaxValuesPerFacet,
-    InvalidMultiSearchMergeFacets, InvalidMultiSearchWeight, InvalidSearchLimit,
-    InvalidSearchOffset,
+    InvalidMultiSearchWeight, InvalidSearchLimit, InvalidSearchOffset,
 };
 use meilisearch_types::error::ResponseError;
-use meilisearch_types::index_uid::IndexUid;
 use meilisearch_types::milli::score_details::{ScoreDetails, ScoreValue};
-use meilisearch_types::milli::{self, DocumentId, OrderBy, TimeBudget};
+use meilisearch_types::milli::{self, DocumentId, TimeBudget};
 use roaring::RoaringBitmap;
 use serde::Serialize;

 use super::ranking_rules::{self, RankingRules};
 use super::{
-    compute_facet_distribution_stats, prepare_search, AttributesFormat, ComputedFacets, FacetStats,
-    HitMaker, HitsInfo, RetrieveVectors, SearchHit, SearchKind, SearchQuery, SearchQueryWithIndex,
+    prepare_search, AttributesFormat, HitMaker, HitsInfo, RetrieveVectors, SearchHit, SearchKind,
+    SearchQuery, SearchQueryWithIndex,
 };
 use crate::error::MeilisearchHttpError;
 use crate::routes::indexes::search::search_kind;
@@ -77,17 +73,6 @@ pub struct Federation {
    pub limit: usize,
    #[deserr(default = super::DEFAULT_SEARCH_OFFSET(), error = DeserrJsonError<InvalidSearchOffset>)]
    pub offset: usize,
-    #[deserr(default, error = DeserrJsonError<InvalidMultiSearchFacetsByIndex>)]
-    pub facets_by_index: BTreeMap<IndexUid, Option<Vec<String>>>,
-    #[deserr(default, error = DeserrJsonError<InvalidMultiSearchMergeFacets>)]
-    pub merge_facets: Option<MergeFacets>,
-}
-
-#[derive(Copy, Clone, Debug, deserr::Deserr, Default)]
-#[deserr(error = DeserrJsonError<InvalidMultiSearchMergeFacets>, rename_all = camelCase, deny_unknown_fields)]
-pub struct MergeFacets {
-    #[deserr(default, error = DeserrJsonError<InvalidMultiSearchMaxValuesPerFacet>)]
-    pub max_values_per_facet: Option<usize>,
 }

 #[derive(Debug, deserr::Deserr)]
@@ -97,7 +82,7 @@ pub struct FederatedSearch {
    #[deserr(default)]
    pub federation: Option<Federation>,
 }
-#[derive(Serialize, Clone)]
+#[derive(Serialize, Clone, PartialEq)]
 #[serde(rename_all = "camelCase")]
 pub struct FederatedSearchResult {
    pub hits: Vec<SearchHit>,
@@ -108,13 +93,6 @@ pub struct FederatedSearchResult {
    #[serde(skip_serializing_if = "Option::is_none")]
    pub semantic_hit_count: Option<u32>,

-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub facet_distribution: Option<BTreeMap<String, IndexMap<String, u64>>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub facet_stats: Option<BTreeMap<String, FacetStats>>,
-    #[serde(skip_serializing_if = "FederatedFacets::is_empty")]
-    pub facets_by_index: FederatedFacets,
-
    // These fields are only used for analytics purposes
    #[serde(skip)]
    pub degraded: bool,
@@ -131,9 +109,6 @@ impl fmt::Debug for FederatedSearchResult {
            semantic_hit_count,
            degraded,
            used_negative_operator,
-            facet_distribution,
-            facet_stats,
-            facets_by_index,
        } = self;

        let mut debug = f.debug_struct("SearchResult");
@@ -147,18 +122,9 @@ impl fmt::Debug for FederatedSearchResult {
        if *degraded {
            debug.field("degraded", degraded);
        }
-        if let Some(facet_distribution) = facet_distribution {
-            debug.field("facet_distribution", &facet_distribution);
-        }
-        if let Some(facet_stats) = facet_stats {
-            debug.field("facet_stats", &facet_stats);
-        }
        if let Some(semantic_hit_count) = semantic_hit_count {
            debug.field("semantic_hit_count", &semantic_hit_count);
        }
-        if !facets_by_index.is_empty() {
-            debug.field("facets_by_index", &facets_by_index);
-        }

        debug.finish()
    }
@@ -347,104 +313,16 @@ struct SearchHitByIndex {
 }

 struct SearchResultByIndex {
-    index: String,
    hits: Vec<SearchHitByIndex>,
-    estimated_total_hits: usize,
+    candidates: RoaringBitmap,
    degraded: bool,
    used_negative_operator: bool,
-    facets: Option<ComputedFacets>,
-}
-
-#[derive(Debug, Clone, Default, Serialize)]
-pub struct FederatedFacets(pub BTreeMap<String, ComputedFacets>);
-
-impl FederatedFacets {
-    pub fn insert(&mut self, index: String, facets: Option<ComputedFacets>) {
-        if let Some(facets) = facets {
-            self.0.insert(index, facets);
-        }
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.0.is_empty()
-    }
-
-    pub fn merge(
-        self,
-        MergeFacets { max_values_per_facet }: MergeFacets,
-        facet_order: BTreeMap<String, (String, OrderBy)>,
-    ) -> Option<ComputedFacets> {
-        if self.is_empty() {
-            return None;
-        }
-
-        let mut distribution: BTreeMap<String, _> = Default::default();
-        let mut stats: BTreeMap<String, FacetStats> = Default::default();
-
-        for facets_by_index in self.0.into_values() {
-            for (facet, index_distribution) in facets_by_index.distribution {
-                match distribution.entry(facet) {
-                    std::collections::btree_map::Entry::Vacant(entry) => {
-                        entry.insert(index_distribution);
-                    }
-                    std::collections::btree_map::Entry::Occupied(mut entry) => {
-                        let distribution = entry.get_mut();
-
-                        for (value, index_count) in index_distribution {
-                            distribution
-                                .entry(value)
-                                .and_modify(|count| *count += index_count)
-                                .or_insert(index_count);
-                        }
-                    }
-                }
-            }
-
-            for (facet, index_stats) in facets_by_index.stats {
-                match stats.entry(facet) {
-                    std::collections::btree_map::Entry::Vacant(entry) => {
-                        entry.insert(index_stats);
-                    }
-                    std::collections::btree_map::Entry::Occupied(mut entry) => {
-                        let stats = entry.get_mut();
-
-                        stats.min = f64::min(stats.min, index_stats.min);
-                        stats.max = f64::max(stats.max, index_stats.max);
-                    }
-                }
-            }
-        }
-
-        // fixup order
-        for (facet, values) in &mut distribution {
-            let order_by = facet_order.get(facet).map(|(_, order)| *order).unwrap_or_default();
-
-            match order_by {
-                OrderBy::Lexicographic => {
-                    values.sort_unstable_by(|left, _, right, _| left.cmp(right))
-                }
-                OrderBy::Count => {
-                    values.sort_unstable_by(|_, left, _, right| {
-                        left.cmp(right)
-                            // biggest first
-                            .reverse()
-                    })
-                }
-            }
-
-            if let Some(max_values_per_facet) = max_values_per_facet {
-                values.truncate(max_values_per_facet)
-            };
-        }
-
-        Some(ComputedFacets { distribution, stats })
-    }
 }

 pub fn perform_federated_search(
    index_scheduler: &IndexScheduler,
    queries: Vec<SearchQueryWithIndex>,
-    mut federation: Federation,
+    federation: Federation,
    features: RoFeatures,
 ) -> Result<FederatedSearchResult, ResponseError> {
    let before_search = std::time::Instant::now();
@@ -464,16 +342,6 @@ pub fn perform_federated_search(
            .into());
        }

-        if let Some(facets) = federated_query.has_facets() {
-            let facets = facets.to_owned();
-            return Err(MeilisearchHttpError::FacetsInFederatedQuery(
-                query_index,
-                federated_query.index_uid.into_inner(),
-                facets,
-            )
-            .into());
-        }
-
        let (index_uid, query, federation_options) = federated_query.into_index_query_federation();

        queries_by_index.entry(index_uid.into_inner()).or_default().push(QueryByIndex {
@@ -485,24 +353,13 @@ pub fn perform_federated_search(

    // 2. perform queries, merge and make hits index by index
    let required_hit_count = federation.limit + federation.offset;
-
    // In step (2), semantic_hit_count will be set to Some(0) if any search kind uses semantic
    // Then in step (3), we'll update its value if there is any semantic search
    let mut semantic_hit_count = None;
    let mut results_by_index = Vec::with_capacity(queries_by_index.len());
    let mut previous_query_data: Option<(RankingRules, usize, String)> = None;

-    // remember the order and name of first index for each facet when merging with index settings
-    // to detect if the order is inconsistent for a facet.
-    let mut facet_order: Option<BTreeMap<String, (String, OrderBy)>> = match federation.merge_facets
-    {
-        Some(MergeFacets { .. }) => Some(Default::default()),
-        _ => None,
-    };
-
    for (index_uid, queries) in queries_by_index {
-        let first_query_index = queries.first().map(|query| query.query_index);
-
        let index = match index_scheduler.index(&index_uid) {
            Ok(index) => index,
            Err(err) => {
@@ -510,8 +367,9 @@ pub fn perform_federated_search(
                // Patch the HTTP status code to 400 as it defaults to 404 for `index_not_found`, but
                // here the resource not found is not part of the URL.
                err.code = StatusCode::BAD_REQUEST;
-                if let Some(query_index) = first_query_index {
-                    err.message = format!("Inside `.queries[{}]`: {}", query_index, err.message);
+                if let Some(query) = queries.first() {
+                    err.message =
+                        format!("Inside `.queries[{}]`: {}", query.query_index, err.message);
                }
                return Err(err);
            }
@@ -522,6 +380,9 @@ pub fn perform_federated_search(

        let criteria = index.criteria(&rtxn)?;

+        // stuff we need for the hitmaker
+        let script_lang_map = index.script_language(&rtxn)?;
+
        let dictionary = index.dictionary(&rtxn)?;
        let dictionary: Option<Vec<_>> =
            dictionary.as_ref().map(|x| x.iter().map(String::as_str).collect());
@@ -536,23 +397,6 @@ pub fn perform_federated_search(
        let mut used_negative_operator = false;
        let mut candidates = RoaringBitmap::new();

-        let facets_by_index = federation.facets_by_index.remove(&index_uid).flatten();
-
-        // TODO: recover the max size + facets_by_index as return value of this function so as not to ask it for all queries
-        if let Err(mut error) =
-            check_facet_order(&mut facet_order, &index_uid, &facets_by_index, &index, &rtxn)
-        {
-            error.message = format!(
-                "Inside `.federation.facetsByIndex.{index_uid}`: {error}{}",
-                if let Some(query_index) = first_query_index {
-                    format!("\n - Note: index `{index_uid}` used in `.queries[{query_index}]`")
-                } else {
-                    Default::default()
-                }
-            );
-            return Err(error);
-        }
-
        // 2.1. Compute all candidates for each query in the index
        let mut results_by_query = Vec::with_capacity(queries.len());

@@ -650,7 +494,6 @@ pub fn perform_federated_search(
                    sort: query.sort,
                    show_ranking_score: query.show_ranking_score,
                    show_ranking_score_details: query.show_ranking_score_details,
-                    locales: query.locales.map(|l| l.iter().copied().map(Into::into).collect()),
                };

                let milli::SearchResult {
@@ -666,7 +509,11 @@ pub fn perform_federated_search(
                degraded |= query_degraded;
                used_negative_operator |= query_used_negative_operator;

-                let tokenizer = HitMaker::tokenizer(dictionary.as_deref(), separators.as_deref());
+                let tokenizer = HitMaker::tokenizer(
+                    &script_lang_map,
+                    dictionary.as_deref(),
+                    separators.as_deref(),
+                );

                let formatter_builder = HitMaker::formatter_builder(matching_words, tokenizer);

@@ -721,116 +568,34 @@ pub fn perform_federated_search(
                .collect();

        let merged_result = merged_result?;
-
-        let estimated_total_hits = candidates.len() as usize;
-
-        let facets = facets_by_index
-            .map(|facets_by_index| {
-                compute_facet_distribution_stats(
-                    &facets_by_index,
-                    &index,
-                    &rtxn,
-                    candidates,
-                    super::Route::MultiSearch,
-                )
-            })
-            .transpose()
-            .map_err(|mut error| {
-                error.message = format!(
-                    "Inside `.federation.facetsByIndex.{index_uid}`: {}{}",
-                    error.message,
-                    if let Some(query_index) = first_query_index {
-                        format!("\n - Note: index `{index_uid}` used in `.queries[{query_index}]`")
-                    } else {
-                        Default::default()
-                    }
-                );
-                error
-            })?;
-
        results_by_index.push(SearchResultByIndex {
-            index: index_uid,
            hits: merged_result,
-            estimated_total_hits,
+            candidates,
            degraded,
            used_negative_operator,
-            facets,
        });
    }

-    // bonus step, make sure to return an error if an index wants a non-faceted field, even if no query actually uses that index.
-    for (index_uid, facets) in federation.facets_by_index {
-        let index = match index_scheduler.index(&index_uid) {
-            Ok(index) => index,
-            Err(err) => {
-                let mut err = ResponseError::from(err);
-                // Patch the HTTP status code to 400 as it defaults to 404 for `index_not_found`, but
-                // here the resource not found is not part of the URL.
-                err.code = StatusCode::BAD_REQUEST;
-                err.message = format!(
-                    "Inside `.federation.facetsByIndex.{index_uid}`: {}\n - Note: index `{index_uid}` is not used in queries",
-                    err.message
-                );
-                return Err(err);
-            }
-        };
-
-        // Important: this is the only transaction we'll use for this index during this federated search
-        let rtxn = index.read_txn()?;
-
-        if let Err(mut error) =
-            check_facet_order(&mut facet_order, &index_uid, &facets, &index, &rtxn)
-        {
-            error.message = format!(
-                "Inside `.federation.facetsByIndex.{index_uid}`: {error}\n - Note: index `{index_uid}` is not used in queries",
-            );
-            return Err(error);
-        }
-
-        if let Some(facets) = facets {
-            if let Err(mut error) = compute_facet_distribution_stats(
-                &facets,
-                &index,
-                &rtxn,
-                Default::default(),
-                super::Route::MultiSearch,
-            ) {
-                error.message =
-                    format!("Inside `.federation.facetsByIndex.{index_uid}`: {}\n - Note: index `{index_uid}` is not used in queries", error.message);
-                return Err(error);
-            }
-        }
-    }
-
    // 3. merge hits and metadata across indexes
    // 3.1 merge metadata
-    let (estimated_total_hits, degraded, used_negative_operator, facets) = {
+    let (estimated_total_hits, degraded, used_negative_operator) = {
        let mut estimated_total_hits = 0;
        let mut degraded = false;
        let mut used_negative_operator = false;

-        let mut facets: FederatedFacets = FederatedFacets::default();
-
        for SearchResultByIndex {
-            index,
            hits: _,
-            estimated_total_hits: estimated_total_hits_by_index,
-            facets: facets_by_index,
+            candidates,
            degraded: degraded_by_index,
            used_negative_operator: used_negative_operator_by_index,
-        } in &mut results_by_index
+        } in &results_by_index
        {
-            estimated_total_hits += *estimated_total_hits_by_index;
+            estimated_total_hits += candidates.len() as usize;
            degraded |= *degraded_by_index;
            used_negative_operator |= *used_negative_operator_by_index;
-
-            let facets_by_index = std::mem::take(facets_by_index);
-            let index = std::mem::take(index);
-
-            facets.insert(index, facets_by_index);
        }

-        (estimated_total_hits, degraded, used_negative_operator, facets)
+        (estimated_total_hits, degraded, used_negative_operator)
    };

    // 3.2 merge hits
@@ -847,20 +612,6 @@ pub fn perform_federated_search(
        .map(|hit| hit.hit)
        .collect();

-    let (facet_distribution, facet_stats, facets_by_index) =
-        match federation.merge_facets.zip(facet_order) {
-            Some((merge_facets, facet_order)) => {
-                let facets = facets.merge(merge_facets, facet_order);
-
-                let (facet_distribution, facet_stats) = facets
-                    .map(|ComputedFacets { distribution, stats }| (distribution, stats))
-                    .unzip();
-
-                (facet_distribution, facet_stats, FederatedFacets::default())
-            }
-            None => (None, None, facets),
-        };
-
    let search_result = FederatedSearchResult {
        hits: merged_hits,
        processing_time_ms: before_search.elapsed().as_millis(),
@@ -872,39 +623,7 @@ pub fn perform_federated_search(
        semantic_hit_count,
        degraded,
        used_negative_operator,
-        facet_distribution,
-        facet_stats,
-        facets_by_index,
    };

    Ok(search_result)
 }
-
-fn check_facet_order(
-    facet_order: &mut Option<BTreeMap<String, (String, OrderBy)>>,
-    current_index: &str,
-    facets_by_index: &Option<Vec<String>>,
-    index: &milli::Index,
-    rtxn: &milli::heed::RoTxn<'_>,
-) -> Result<(), ResponseError> {
-    if let (Some(facet_order), Some(facets_by_index)) = (facet_order, facets_by_index) {
-        let index_facet_order = index.sort_facet_values_by(rtxn)?;
-        for facet in facets_by_index {
-            let index_facet_order = index_facet_order.get(facet);
-            let (previous_index, previous_facet_order) = facet_order
-                .entry(facet.to_owned())
-                .or_insert_with(|| (current_index.to_owned(), index_facet_order));
-            if previous_facet_order != &index_facet_order {
-                return Err(MeilisearchHttpError::InconsistentFacetOrder {
-                    facet: facet.clone(),
-                    previous_facet_order: *previous_facet_order,
-                    previous_uid: previous_index.clone(),
-                    current_uid: current_index.to_owned(),
-                    index_facet_order,
-                }
-                .into());
-            }
-        }
-    };
-    Ok(())
-}
--- a/meilisearch/src/search/mod.rs
+++ b/meilisearch/src/search/mod.rs
@@ -1,6 +1,6 @@
 use core::fmt;
 use std::cmp::min;
-use std::collections::{BTreeMap, BTreeSet, HashSet};
+use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
 use std::str::FromStr;
 use std::sync::Arc;
 use std::time::{Duration, Instant};
@@ -15,17 +15,16 @@ use meilisearch_types::error::deserr_codes::*;
 use meilisearch_types::error::{Code, ResponseError};
 use meilisearch_types::heed::RoTxn;
 use meilisearch_types::index_uid::IndexUid;
-use meilisearch_types::locales::Locale;
 use meilisearch_types::milli::score_details::{ScoreDetails, ScoringStrategy};
 use meilisearch_types::milli::vector::parsed_vectors::ExplicitVectors;
 use meilisearch_types::milli::vector::Embedder;
 use meilisearch_types::milli::{FacetValueHit, OrderBy, SearchForFacetValues, TimeBudget};
 use meilisearch_types::settings::DEFAULT_PAGINATION_MAX_TOTAL_HITS;
 use meilisearch_types::{milli, Document};
-use milli::tokenizer::{Language, TokenizerBuilder};
+use milli::tokenizer::TokenizerBuilder;
 use milli::{
-    AscDesc, FieldId, FieldsIdsMap, Filter, FormatOptions, Index, LocalizedAttributesRule,
-    MatchBounds, MatcherBuilder, SortError, TermsMatchingStrategy, DEFAULT_VALUES_PER_FACET,
+    AscDesc, FieldId, FieldsIdsMap, Filter, FormatOptions, Index, MatchBounds, MatcherBuilder,
+    SortError, TermsMatchingStrategy, DEFAULT_VALUES_PER_FACET,
 };
 use regex::Regex;
 use serde::Serialize;
@@ -101,8 +100,6 @@ pub struct SearchQuery {
    pub attributes_to_search_on: Option<Vec<String>>,
    #[deserr(default, error = DeserrJsonError<InvalidSearchRankingScoreThreshold>, default)]
    pub ranking_score_threshold: Option<RankingScoreThreshold>,
-    #[deserr(default, error = DeserrJsonError<InvalidSearchLocales>, default)]
-    pub locales: Option<Vec<Locale>>,
 }

 #[derive(Debug, Clone, Copy, PartialEq, Deserr)]
@@ -172,7 +169,6 @@ impl fmt::Debug for SearchQuery {
            matching_strategy,
            attributes_to_search_on,
            ranking_score_threshold,
-            locales,
        } = self;

        let mut debug = f.debug_struct("SearchQuery");
@@ -254,10 +250,6 @@ impl fmt::Debug for SearchQuery {
            debug.field("ranking_score_threshold", &ranking_score_threshold);
        }

-        if let Some(locales) = locales {
-            debug.field("locales", &locales);
-        }
-
        debug.finish()
    }
 }
@@ -267,54 +259,58 @@ impl fmt::Debug for SearchQuery {
 pub struct HybridQuery {
    #[deserr(default, error = DeserrJsonError<InvalidSearchSemanticRatio>, default)]
    pub semantic_ratio: SemanticRatio,
-    #[deserr(error = DeserrJsonError<InvalidEmbedder>)]
-    pub embedder: String,
+    #[deserr(default, error = DeserrJsonError<InvalidEmbedder>, default)]
+    pub embedder: Option<String>,
 }

 #[derive(Clone)]
 pub enum SearchKind {
    KeywordOnly,
-    SemanticOnly { embedder_name: String, embedder: Arc<Embedder>, quantized: bool },
-    Hybrid { embedder_name: String, embedder: Arc<Embedder>, quantized: bool, semantic_ratio: f32 },
+    SemanticOnly { embedder_name: String, embedder: Arc<Embedder> },
+    Hybrid { embedder_name: String, embedder: Arc<Embedder>, semantic_ratio: f32 },
 }

 impl SearchKind {
    pub(crate) fn semantic(
        index_scheduler: &index_scheduler::IndexScheduler,
        index: &Index,
-        embedder_name: &str,
+        embedder_name: Option<&str>,
        vector_len: Option<usize>,
    ) -> Result<Self, ResponseError> {
-        let (embedder_name, embedder, quantized) =
+        let (embedder_name, embedder) =
            Self::embedder(index_scheduler, index, embedder_name, vector_len)?;
-        Ok(Self::SemanticOnly { embedder_name, embedder, quantized })
+        Ok(Self::SemanticOnly { embedder_name, embedder })
    }

    pub(crate) fn hybrid(
        index_scheduler: &index_scheduler::IndexScheduler,
        index: &Index,
-        embedder_name: &str,
+        embedder_name: Option<&str>,
        semantic_ratio: f32,
        vector_len: Option<usize>,
    ) -> Result<Self, ResponseError> {
-        let (embedder_name, embedder, quantized) =
+        let (embedder_name, embedder) =
            Self::embedder(index_scheduler, index, embedder_name, vector_len)?;
-        Ok(Self::Hybrid { embedder_name, embedder, quantized, semantic_ratio })
+        Ok(Self::Hybrid { embedder_name, embedder, semantic_ratio })
    }

    pub(crate) fn embedder(
        index_scheduler: &index_scheduler::IndexScheduler,
        index: &Index,
-        embedder_name: &str,
+        embedder_name: Option<&str>,
        vector_len: Option<usize>,
-    ) -> Result<(String, Arc<Embedder>, bool), ResponseError> {
+    ) -> Result<(String, Arc<Embedder>), ResponseError> {
        let embedder_configs = index.embedding_configs(&index.read_txn()?)?;
        let embedders = index_scheduler.embedders(embedder_configs)?;

-        let (embedder, _, quantized) = embedders
-            .get(embedder_name)
+        let embedder_name = embedder_name.unwrap_or_else(|| embedders.get_default_embedder_name());
+
+        let embedder = embedders.get(embedder_name);
+
+        let embedder = embedder
            .ok_or(milli::UserError::InvalidEmbedder(embedder_name.to_owned()))
-            .map_err(milli::Error::from)?;
+            .map_err(milli::Error::from)?
+            .0;

        if let Some(vector_len) = vector_len {
            if vector_len != embedder.dimensions() {
@@ -328,7 +324,7 @@ impl SearchKind {
            }
        }

-        Ok((embedder_name.to_owned(), embedder, quantized))
+        Ok((embedder_name.to_owned(), embedder))
    }
 }

@@ -429,14 +425,15 @@ pub struct SearchQueryWithIndex {
    pub attributes_to_search_on: Option<Vec<String>>,
    #[deserr(default, error = DeserrJsonError<InvalidSearchRankingScoreThreshold>, default)]
    pub ranking_score_threshold: Option<RankingScoreThreshold>,
-    #[deserr(default, error = DeserrJsonError<InvalidSearchLocales>, default)]
-    pub locales: Option<Vec<Locale>>,

    #[deserr(default)]
    pub federation_options: Option<FederationOptions>,
 }

 impl SearchQueryWithIndex {
+    pub fn has_federation_options(&self) -> bool {
+        self.federation_options.is_some()
+    }
    pub fn has_pagination(&self) -> Option<&'static str> {
        if self.offset.is_some() {
            Some("offset")
@@ -451,10 +448,6 @@ impl SearchQueryWithIndex {
        }
    }

-    pub fn has_facets(&self) -> Option<&[String]> {
-        self.facets.as_deref().filter(|v| !v.is_empty())
-    }
-
    pub fn into_index_query_federation(self) -> (IndexUid, SearchQuery, Option<FederationOptions>) {
        let SearchQueryWithIndex {
            index_uid,
@@ -484,7 +477,6 @@ impl SearchQueryWithIndex {
            attributes_to_search_on,
            hybrid,
            ranking_score_threshold,
-            locales,
        } = self;
        (
            index_uid,
@@ -514,7 +506,6 @@ impl SearchQueryWithIndex {
                attributes_to_search_on,
                hybrid,
                ranking_score_threshold,
-                locales,
                // do not use ..Default::default() here,
                // rather add any missing field from `SearchQuery` to `SearchQueryWithIndex`
            },
@@ -534,8 +525,8 @@ pub struct SimilarQuery {
    pub limit: usize,
    #[deserr(default, error = DeserrJsonError<InvalidSimilarFilter>)]
    pub filter: Option<Value>,
-    #[deserr(error = DeserrJsonError<InvalidEmbedder>)]
-    pub embedder: String,
+    #[deserr(default, error = DeserrJsonError<InvalidEmbedder>, default)]
+    pub embedder: Option<String>,
    #[deserr(default, error = DeserrJsonError<InvalidSimilarAttributesToRetrieve>)]
    pub attributes_to_retrieve: Option<BTreeSet<String>>,
    #[deserr(default, error = DeserrJsonError<InvalidSimilarRetrieveVectors>)]
@@ -789,7 +780,7 @@ fn prepare_search<'t>(
                search.query(q);
            }
        }
-        SearchKind::SemanticOnly { embedder_name, embedder, quantized } => {
+        SearchKind::SemanticOnly { embedder_name, embedder } => {
            let vector = match query.vector.clone() {
                Some(vector) => vector,
                None => {
@@ -803,19 +794,14 @@ fn prepare_search<'t>(
                }
            };

-            search.semantic(embedder_name.clone(), embedder.clone(), *quantized, Some(vector));
+            search.semantic(embedder_name.clone(), embedder.clone(), Some(vector));
        }
-        SearchKind::Hybrid { embedder_name, embedder, quantized, semantic_ratio: _ } => {
+        SearchKind::Hybrid { embedder_name, embedder, semantic_ratio: _ } => {
            if let Some(q) = &query.q {
                search.query(q);
            }
            // will be embedded in hybrid search if necessary
-            search.semantic(
-                embedder_name.clone(),
-                embedder.clone(),
-                *quantized,
-                query.vector.clone(),
-            );
+            search.semantic(embedder_name.clone(), embedder.clone(), query.vector.clone());
        }
    }

@@ -880,10 +866,6 @@ fn prepare_search<'t>(
        search.sort_criteria(sort);
    }

-    if let Some(ref locales) = query.locales {
-        search.locales(locales.iter().copied().map(Into::into).collect());
-    }
-
    Ok((search, is_finite_pagination, max_total_hits, offset))
 }

@@ -935,7 +917,6 @@ pub fn perform_search(
        highlight_pre_tag,
        highlight_post_tag,
        crop_marker,
-        locales,
        // already used in prepare_search
        vector: _,
        hybrid: _,
@@ -960,7 +941,6 @@ pub fn perform_search(
        sort,
        show_ranking_score,
        show_ranking_score_details,
-        locales: locales.map(|l| l.iter().copied().map(Into::into).collect()),
    };

    let documents = make_hits(
@@ -989,13 +969,39 @@ pub fn perform_search(
        HitsInfo::OffsetLimit { limit, offset, estimated_total_hits: number_of_hits }
    };

-    let (facet_distribution, facet_stats) = facets
-        .map(move |facets| {
-            compute_facet_distribution_stats(&facets, index, &rtxn, candidates, Route::Search)
-        })
-        .transpose()?
-        .map(|ComputedFacets { distribution, stats }| (distribution, stats))
-        .unzip();
+    let (facet_distribution, facet_stats) = match facets {
+        Some(ref fields) => {
+            let mut facet_distribution = index.facets_distribution(&rtxn);
+
+            let max_values_by_facet = index
+                .max_values_per_facet(&rtxn)
+                .map_err(milli::Error::from)?
+                .map(|x| x as usize)
+                .unwrap_or(DEFAULT_VALUES_PER_FACET);
+            facet_distribution.max_values_per_facet(max_values_by_facet);
+
+            let sort_facet_values_by =
+                index.sort_facet_values_by(&rtxn).map_err(milli::Error::from)?;
+
+            if fields.iter().all(|f| f != "*") {
+                let fields: Vec<_> =
+                    fields.iter().map(|n| (n, sort_facet_values_by.get(n))).collect();
+                facet_distribution.facets(fields);
+            }
+
+            let distribution = facet_distribution
+                .candidates(candidates)
+                .default_order_by(sort_facet_values_by.get("*"))
+                .execute()?;
+            let stats = facet_distribution.compute_stats()?;
+            (Some(distribution), Some(stats))
+        }
+        None => (None, None),
+    };
+
+    let facet_stats = facet_stats.map(|stats| {
+        stats.into_iter().map(|(k, (min, max))| (k, FacetStats { min, max })).collect()
+    });

    let result = SearchResult {
        hits: documents,
@@ -1011,61 +1017,6 @@ pub fn perform_search(
    Ok(result)
 }

-#[derive(Debug, Clone, Default, Serialize)]
-pub struct ComputedFacets {
-    pub distribution: BTreeMap<String, IndexMap<String, u64>>,
-    pub stats: BTreeMap<String, FacetStats>,
-}
-
-enum Route {
-    Search,
-    MultiSearch,
-}
-
-fn compute_facet_distribution_stats<S: AsRef<str>>(
-    facets: &[S],
-    index: &Index,
-    rtxn: &RoTxn,
-    candidates: roaring::RoaringBitmap,
-    route: Route,
-) -> Result<ComputedFacets, ResponseError> {
-    let mut facet_distribution = index.facets_distribution(rtxn);
-
-    let max_values_by_facet = index
-        .max_values_per_facet(rtxn)
-        .map_err(milli::Error::from)?
-        .map(|x| x as usize)
-        .unwrap_or(DEFAULT_VALUES_PER_FACET);
-
-    facet_distribution.max_values_per_facet(max_values_by_facet);
-
-    let sort_facet_values_by = index.sort_facet_values_by(rtxn).map_err(milli::Error::from)?;
-
-    // add specific facet if there is no placeholder
-    if facets.iter().all(|f| f.as_ref() != "*") {
-        let fields: Vec<_> =
-            facets.iter().map(|n| (n, sort_facet_values_by.get(n.as_ref()))).collect();
-        facet_distribution.facets(fields);
-    }
-
-    let distribution = facet_distribution
-        .candidates(candidates)
-        .default_order_by(sort_facet_values_by.get("*"))
-        .execute()
-        .map_err(|error| match (error, route) {
-            (
-                error @ milli::Error::UserError(milli::UserError::InvalidFacetsDistribution {
-                    ..
-                }),
-                Route::MultiSearch,
-            ) => ResponseError::from_msg(error.to_string(), Code::InvalidMultiSearchFacets),
-            (error, _) => error.into(),
-        })?;
-    let stats = facet_distribution.compute_stats()?;
-    let stats = stats.into_iter().map(|(k, (min, max))| (k, FacetStats { min, max })).collect();
-    Ok(ComputedFacets { distribution, stats })
-}
-
 pub fn search_from_kind(
    search_kind: SearchKind,
    search: milli::Search<'_>,
@@ -1095,7 +1046,6 @@ struct AttributesFormat {
    sort: Option<Vec<String>>,
    show_ranking_score: bool,
    show_ranking_score_details: bool,
-    locales: Option<Vec<Language>>,
 }

 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
@@ -1143,16 +1093,19 @@ struct HitMaker<'a> {
    show_ranking_score_details: bool,
    sort: Option<Vec<String>>,
    show_matches_position: bool,
-    locales: Option<Vec<Language>>,
 }

 impl<'a> HitMaker<'a> {
    pub fn tokenizer<'b>(
+        script_lang_map: &'b HashMap<milli::tokenizer::Script, Vec<milli::tokenizer::Language>>,
        dictionary: Option<&'b [&'b str]>,
        separators: Option<&'b [&'b str]>,
    ) -> milli::tokenizer::Tokenizer<'b> {
        let mut tokenizer_builder = TokenizerBuilder::default();
        tokenizer_builder.create_char_map(true);
+        if !script_lang_map.is_empty() {
+            tokenizer_builder.allow_list(script_lang_map);
+        }

        if let Some(separators) = separators {
            tokenizer_builder.separators(separators);
@@ -1265,7 +1218,6 @@ impl<'a> HitMaker<'a> {
            show_ranking_score_details: format.show_ranking_score_details,
            show_matches_position: format.show_matches_position,
            sort: format.sort,
-            locales: format.locales,
        })
    }

@@ -1321,9 +1273,6 @@ impl<'a> HitMaker<'a> {
            document.insert("_vectors".into(), vectors.into());
        }

-        let localized_attributes =
-            self.index.localized_attributes_rules(self.rtxn)?.unwrap_or_default();
-
        let (matches_position, formatted) = format_fields(
            &displayed_document,
            &self.fields_ids_map,
@@ -1331,8 +1280,6 @@ impl<'a> HitMaker<'a> {
            &self.formatted_options,
            self.show_matches_position,
            &self.displayed_ids,
-            self.locales.as_deref(),
-            &localized_attributes,
        )?;

        if let Some(sort) = self.sort.as_ref() {
@@ -1365,6 +1312,8 @@ fn make_hits<'a>(
 ) -> Result<Vec<SearchHit>, MeilisearchHttpError> {
    let mut documents = Vec::new();

+    let script_lang_map = index.script_language(rtxn)?;
+
    let dictionary = index.dictionary(rtxn)?;
    let dictionary: Option<Vec<_>> =
        dictionary.as_ref().map(|x| x.iter().map(String::as_str).collect());
@@ -1372,7 +1321,8 @@ fn make_hits<'a>(
    let separators: Option<Vec<_>> =
        separators.as_ref().map(|x| x.iter().map(String::as_str).collect());

-    let tokenizer = HitMaker::tokenizer(dictionary.as_deref(), separators.as_deref());
+    let tokenizer =
+        HitMaker::tokenizer(&script_lang_map, dictionary.as_deref(), separators.as_deref());

    let formatter_builder = HitMaker::formatter_builder(matching_words, tokenizer);

@@ -1391,7 +1341,6 @@ pub fn perform_facet_search(
    facet_name: String,
    search_kind: SearchKind,
    features: RoFeatures,
-    locales: Option<Vec<Language>>,
 ) -> Result<FacetSearchResult, ResponseError> {
    let before_search = Instant::now();
    let rtxn = index.read_txn()?;
@@ -1400,20 +1349,6 @@ pub fn perform_facet_search(
        None => TimeBudget::default(),
    };

-    // In the faceted search context, we want to use the intersection between the locales provided by the user
-    // and the locales of the facet string.
-    // If the facet string is not localized, we **ignore** the locales provided by the user because the facet data has no locale.
-    // If the user does not provide locales, we use the locales of the facet string.
-    let localized_attributes = index.localized_attributes_rules(&rtxn)?.unwrap_or_default();
-    let localized_attributes_locales =
-        localized_attributes.into_iter().find(|attr| attr.match_str(&facet_name));
-    let locales = localized_attributes_locales.map(|attr| {
-        attr.locales
-            .into_iter()
-            .filter(|locale| locales.as_ref().map_or(true, |locales| locales.contains(locale)))
-            .collect()
-    });
-
    let (search, _, _, _) =
        prepare_search(index, &rtxn, &search_query, &search_kind, time_budget, features)?;
    let mut facet_search = SearchForFacetValues::new(
@@ -1428,10 +1363,6 @@ pub fn perform_facet_search(
        facet_search.max_values(max_facets as usize);
    }

-    if let Some(locales) = locales {
-        facet_search.locales(locales);
-    }
-
    Ok(FacetSearchResult {
        facet_hits: facet_search.execute()?,
        facet_query,
@@ -1444,7 +1375,6 @@ pub fn perform_similar(
    query: SimilarQuery,
    embedder_name: String,
    embedder: Arc<Embedder>,
-    quantized: bool,
    retrieve_vectors: RetrieveVectors,
    features: RoFeatures,
 ) -> Result<SimilarResult, ResponseError> {
@@ -1473,16 +1403,8 @@ pub fn perform_similar(
        ));
    };

-    let mut similar = milli::Similar::new(
-        internal_id,
-        offset,
-        limit,
-        index,
-        &rtxn,
-        embedder_name,
-        embedder,
-        quantized,
-    );
+    let mut similar =
+        milli::Similar::new(internal_id, offset, limit, index, &rtxn, embedder_name, embedder);

    if let Some(ref filter) = query.filter {
        if let Some(facets) = parse_filter(filter, Code::InvalidSimilarFilter, features)? {
@@ -1521,7 +1443,6 @@ pub fn perform_similar(
        sort: None,
        show_ranking_score,
        show_ranking_score_details,
-        locales: None,
    };

    let hits = make_hits(
@@ -1682,7 +1603,7 @@ fn add_non_formatted_ids_to_formatted_options(
 fn make_document(
    displayed_attributes: &BTreeSet<FieldId>,
    field_ids_map: &FieldsIdsMap,
-    obkv: &obkv::KvReaderU16,
+    obkv: obkv::KvReaderU16,
 ) -> Result<Document, MeilisearchHttpError> {
    let mut document = serde_json::Map::new();

@@ -1703,7 +1624,6 @@ fn make_document(
    Ok(document)
 }

-#[allow(clippy::too_many_arguments)]
 fn format_fields(
    document: &Document,
    field_ids_map: &FieldsIdsMap,
@@ -1711,8 +1631,6 @@ fn format_fields(
    formatted_options: &BTreeMap<FieldId, FormatOptions>,
    compute_matches: bool,
    displayable_ids: &BTreeSet<FieldId>,
-    locales: Option<&[Language]>,
-    localized_attributes: &[LocalizedAttributesRule],
 ) -> Result<(Option<MatchesPosition>, Document), MeilisearchHttpError> {
    let mut matches_position = compute_matches.then(BTreeMap::new);
    let mut document = document.clone();
@@ -1745,22 +1663,7 @@ fn format_fields(
            .reduce(|acc, option| acc.merge(option));
        let mut infos = Vec::new();

-        // if no locales has been provided, we try to find the locales in the localized_attributes.
-        let locales = locales.or_else(|| {
-            localized_attributes
-                .iter()
-                .find(|rule| rule.match_str(key))
-                .map(LocalizedAttributesRule::locales)
-        });
-
-        *value = format_value(
-            std::mem::take(value),
-            builder,
-            format,
-            &mut infos,
-            compute_matches,
-            locales,
-        );
+        *value = format_value(std::mem::take(value), builder, format, &mut infos, compute_matches);

        if let Some(matches) = matches_position.as_mut() {
            if !infos.is_empty() {
@@ -1785,11 +1688,10 @@ fn format_value(
    format_options: Option<FormatOptions>,
    infos: &mut Vec<MatchBounds>,
    compute_matches: bool,
-    locales: Option<&[Language]>,
 ) -> Value {
    match value {
        Value::String(old_string) => {
-            let mut matcher = builder.build(&old_string, locales);
+            let mut matcher = builder.build(&old_string);
            if compute_matches {
                let matches = matcher.matches();
                infos.extend_from_slice(&matches[..]);
@@ -1816,7 +1718,6 @@ fn format_value(
                        }),
                        infos,
                        compute_matches,
-                        locales,
                    )
                })
                .collect(),
@@ -1836,7 +1737,6 @@ fn format_value(
                            }),
                            infos,
                            compute_matches,
-                            locales,
                        ),
                    )
                })
@@ -1845,7 +1745,7 @@ fn format_value(
        Value::Number(number) => {
            let s = number.to_string();

-            let mut matcher = builder.build(&s, locales);
+            let mut matcher = builder.build(&s);
            if compute_matches {
                let matches = matcher.matches();
                infos.extend_from_slice(&matches[..]);
--- a/meilisearch/src/search_queue.rs
+++ b/meilisearch/src/search_queue.rs
@@ -18,7 +18,6 @@
 //!                         And should drop the Permit only once you have freed all the RAM consumed by the method.

 use std::num::NonZeroUsize;
-use std::time::Duration;

 use rand::rngs::StdRng;
 use rand::{Rng, SeedableRng};
@@ -30,31 +29,16 @@ use crate::error::MeilisearchHttpError;
 pub struct SearchQueue {
    sender: mpsc::Sender<oneshot::Sender<Permit>>,
    capacity: usize,
-    /// If we have waited longer than this to get a permit, we should abort the search request entirely.
-    /// The client probably already closed the connection, but we have no way to find out.
-    time_to_abort: Duration,
 }

 /// You should only run search requests while holding this permit.
 /// Once it's dropped, a new search request will be able to process.
-/// You should always try to drop the permit yourself calling the `drop` async method on it.
 #[derive(Debug)]
 pub struct Permit {
    sender: mpsc::Sender<()>,
 }

-impl Permit {
-    /// Drop the permit giving back on permit to the search queue.
-    pub async fn drop(self) {
-        // if the channel is closed then the whole instance is down
-        let _ = self.sender.send(()).await;
-    }
-}
-
 impl Drop for Permit {
-    /// The implicit drop implementation can still be called in multiple cases:
-    /// - We forgot to call the explicit one somewhere => this should be fixed on our side asap
-    /// - The future is cancelled while running and the permit dropped with it
    fn drop(&mut self) {
        let sender = self.sender.clone();
        // if the channel is closed then the whole instance is down
@@ -69,11 +53,7 @@ impl SearchQueue {
        let (sender, receiver) = mpsc::channel(1);

        tokio::task::spawn(Self::run(capacity, paralellism, receiver));
-        Self { sender, capacity, time_to_abort: Duration::from_secs(60) }
-    }
-
-    pub fn with_time_to_abort(self, time_to_abort: Duration) -> Self {
-        Self { time_to_abort, ..self }
+        Self { sender, capacity }
    }

    /// This function is the main loop, it's in charge on scheduling which search request should execute first and
@@ -139,23 +119,9 @@ impl SearchQueue {
    /// Returns a search `Permit`.
    /// It should be dropped as soon as you've freed all the RAM associated with the search request being processed.
    pub async fn try_get_search_permit(&self) -> Result<Permit, MeilisearchHttpError> {
-        let now = std::time::Instant::now();
        let (sender, receiver) = oneshot::channel();
        self.sender.send(sender).await.map_err(|_| MeilisearchHttpError::SearchLimiterIsDown)?;
-        let permit = receiver
-            .await
-            .map_err(|_| MeilisearchHttpError::TooManySearchRequests(self.capacity))?;
-
-        // If we've been for more than one minute to get a search permit, it's better to simply
-        // abort the search request than spending time processing something were the client
-        // most certainly exited or got a timeout a long time ago.
-        // We may find a better solution in https://github.com/actix/actix-web/issues/3462.
-        if now.elapsed() > self.time_to_abort {
-            permit.drop().await;
-            Err(MeilisearchHttpError::TooManySearchRequests(self.capacity))
-        } else {
-            Ok(permit)
-        }
+        receiver.await.map_err(|_| MeilisearchHttpError::TooManySearchRequests(self.capacity))
    }

    /// Returns `Ok(())` if everything seems normal.
--- a/meilisearch/tests/auth/mod.rs
+++ b/meilisearch/tests/auth/mod.rs
@@ -5,3 +5,63 @@ mod payload;
 mod tenant_token;

 mod tenant_token_multi_search;
+
+use actix_web::http::StatusCode;
+
+use crate::common::{Server, Value};
+use crate::json;
+
+impl Server {
+    pub fn use_api_key(&mut self, api_key: impl AsRef<str>) {
+        self.service.api_key = Some(api_key.as_ref().to_string());
+    }
+
+    /// Fetch and use the default admin key for nexts http requests.
+    pub async fn use_admin_key(&mut self, master_key: impl AsRef<str>) {
+        self.use_api_key(master_key);
+        let (response, code) = self.list_api_keys("").await;
+        assert_eq!(200, code, "{:?}", response);
+        let admin_key = &response["results"][1]["key"];
+        self.use_api_key(admin_key.as_str().unwrap());
+    }
+
+    pub async fn add_api_key(&self, content: Value) -> (Value, StatusCode) {
+        let url = "/keys";
+        self.service.post(url, content).await
+    }
+
+    pub async fn get_api_key(&self, key: impl AsRef<str>) -> (Value, StatusCode) {
+        let url = format!("/keys/{}", key.as_ref());
+        self.service.get(url).await
+    }
+
+    pub async fn patch_api_key(&self, key: impl AsRef<str>, content: Value) -> (Value, StatusCode) {
+        let url = format!("/keys/{}", key.as_ref());
+        self.service.patch(url, content).await
+    }
+
+    pub async fn list_api_keys(&self, params: &str) -> (Value, StatusCode) {
+        let url = format!("/keys{params}");
+        self.service.get(url).await
+    }
+
+    pub async fn delete_api_key(&self, key: impl AsRef<str>) -> (Value, StatusCode) {
+        let url = format!("/keys/{}", key.as_ref());
+        self.service.delete(url).await
+    }
+
+    pub async fn dummy_request(
+        &self,
+        method: impl AsRef<str>,
+        url: impl AsRef<str>,
+    ) -> (Value, StatusCode) {
+        match method.as_ref() {
+            "POST" => self.service.post(url, json!({})).await,
+            "PUT" => self.service.put(url, json!({})).await,
+            "PATCH" => self.service.patch(url, json!({})).await,
+            "GET" => self.service.get(url).await,
+            "DELETE" => self.service.delete(url).await,
+            _ => unreachable!(),
+        }
+    }
+}
--- a/meilisearch/tests/auth/tenant_token.rs
+++ b/meilisearch/tests/auth/tenant_token.rs
@@ -6,7 +6,7 @@ use once_cell::sync::Lazy;
 use time::{Duration, OffsetDateTime};

 use super::authorization::{ALL_ACTIONS, AUTHORIZATIONS};
-use crate::common::{Server, Value, DOCUMENTS};
+use crate::common::{Server, Value};
 use crate::json;

 fn generate_tenant_token(
@@ -22,6 +22,36 @@ fn generate_tenant_token(
        .unwrap()
 }

+static DOCUMENTS: Lazy<Value> = Lazy::new(|| {
+    json!([
+        {
+            "title": "Shazam!",
+            "id": "287947",
+            "color": ["green", "blue"]
+        },
+        {
+            "title": "Captain Marvel",
+            "id": "299537",
+            "color": ["yellow", "blue"]
+        },
+        {
+            "title": "Escape Room",
+            "id": "522681",
+            "color": ["yellow", "red"]
+        },
+        {
+            "title": "How to Train Your Dragon: The Hidden World",
+            "id": "166428",
+            "color": ["green", "red"]
+        },
+        {
+            "title": "Glass",
+            "id": "450465",
+            "color": ["blue", "red"]
+        }
+    ])
+});
+
 static INVALID_RESPONSE: Lazy<Value> = Lazy::new(|| {
    json!({
        "message": null,
--- a/meilisearch/tests/common/index.rs
+++ b/meilisearch/tests/common/index.rs
@@ -1,5 +1,4 @@
 use std::fmt::Write;
-use std::marker::PhantomData;
 use std::panic::{catch_unwind, resume_unwind, UnwindSafe};
 use std::time::Duration;

@@ -10,24 +9,19 @@ use urlencoding::encode as urlencode;
 use super::encoder::Encoder;
 use super::service::Service;
 use super::Value;
-use super::{Owned, Shared};
 use crate::json;

-pub struct Index<'a, State = Owned> {
+pub struct Index<'a> {
    pub uid: String,
    pub service: &'a Service,
-    pub(super) encoder: Encoder,
-    pub(super) marker: PhantomData<State>,
+    pub encoder: Encoder,
 }

-impl<'a> Index<'a, Owned> {
-    pub fn to_shared(&self) -> Index<'a, Shared> {
-        Index {
-            uid: self.uid.clone(),
-            service: self.service,
-            encoder: self.encoder,
-            marker: PhantomData,
-        }
+#[allow(dead_code)]
+impl Index<'_> {
+    pub async fn get(&self) -> (Value, StatusCode) {
+        let url = format!("/indexes/{}", urlencode(self.uid.as_ref()));
+        self.service.get(url).await
    }

    pub async fn load_test_set(&self) -> u64 {
@@ -63,7 +57,11 @@ impl<'a> Index<'a, Owned> {
    }

    pub async fn create(&self, primary_key: Option<&str>) -> (Value, StatusCode) {
-        self._create(primary_key).await
+        let body = json!({
+            "uid": self.uid,
+            "primaryKey": primary_key,
+        });
+        self.service.post_encoded("/indexes", body, self.encoder).await
    }

    pub async fn update_raw(&self, body: Value) -> (Value, StatusCode) {
@@ -90,7 +88,13 @@ impl<'a> Index<'a, Owned> {
        documents: Value,
        primary_key: Option<&str>,
    ) -> (Value, StatusCode) {
-        self._add_documents(documents, primary_key).await
+        let url = match primary_key {
+            Some(key) => {
+                format!("/indexes/{}/documents?primaryKey={}", urlencode(self.uid.as_ref()), key)
+            }
+            None => format!("/indexes/{}/documents", urlencode(self.uid.as_ref())),
+        };
+        self.service.post_encoded(url, documents, self.encoder).await
    }

    pub async fn raw_add_documents(
@@ -132,11 +136,80 @@ impl<'a> Index<'a, Owned> {
        }
    }

+    pub async fn wait_task(&self, update_id: u64) -> Value {
+        // try several times to get status, or panic to not wait forever
+        let url = format!("/tasks/{}", update_id);
+        for _ in 0..100 {
+            let (response, status_code) = self.service.get(&url).await;
+            assert_eq!(200, status_code, "response: {}", response);
+
+            if response["status"] == "succeeded" || response["status"] == "failed" {
+                return response;
+            }
+
+            // wait 0.5 second.
+            sleep(Duration::from_millis(500)).await;
+        }
+        panic!("Timeout waiting for update id");
+    }
+
+    pub async fn get_task(&self, update_id: u64) -> (Value, StatusCode) {
+        let url = format!("/tasks/{}", update_id);
+        self.service.get(url).await
+    }
+
    pub async fn list_tasks(&self) -> (Value, StatusCode) {
        let url = format!("/tasks?indexUids={}", self.uid);
        self.service.get(url).await
    }

+    pub async fn filtered_tasks(
+        &self,
+        types: &[&str],
+        statuses: &[&str],
+        canceled_by: &[&str],
+    ) -> (Value, StatusCode) {
+        let mut url = format!("/tasks?indexUids={}", self.uid);
+        if !types.is_empty() {
+            let _ = write!(url, "&types={}", types.join(","));
+        }
+        if !statuses.is_empty() {
+            let _ = write!(url, "&statuses={}", statuses.join(","));
+        }
+        if !canceled_by.is_empty() {
+            let _ = write!(url, "&canceledBy={}", canceled_by.join(","));
+        }
+        self.service.get(url).await
+    }
+
+    pub async fn get_document(&self, id: u64, options: Option<Value>) -> (Value, StatusCode) {
+        let mut url = format!("/indexes/{}/documents/{}", urlencode(self.uid.as_ref()), id);
+        if let Some(options) = options {
+            write!(url, "{}", yaup::to_string(&options).unwrap()).unwrap();
+        }
+        self.service.get(url).await
+    }
+
+    pub async fn get_document_by_filter(&self, payload: Value) -> (Value, StatusCode) {
+        let url = format!("/indexes/{}/documents/fetch", urlencode(self.uid.as_ref()));
+        self.service.post(url, payload).await
+    }
+
+    pub async fn get_all_documents_raw(&self, options: &str) -> (Value, StatusCode) {
+        let url = format!("/indexes/{}/documents{}", urlencode(self.uid.as_ref()), options);
+        self.service.get(url).await
+    }
+
+    pub async fn get_all_documents(&self, options: GetAllDocumentsOptions) -> (Value, StatusCode) {
+        let url = format!(
+            "/indexes/{}/documents{}",
+            urlencode(self.uid.as_ref()),
+            yaup::to_string(&options).unwrap()
+        );
+
+        self.service.get(url).await
+    }
+
    pub async fn delete_document(&self, id: u64) -> (Value, StatusCode) {
        let url = format!("/indexes/{}/documents/{}", urlencode(self.uid.as_ref()), id);
        self.service.delete(url).await
@@ -164,8 +237,14 @@ impl<'a> Index<'a, Owned> {
        self.service.post_encoded(url, body, self.encoder).await
    }

+    pub async fn settings(&self) -> (Value, StatusCode) {
+        let url = format!("/indexes/{}/settings", urlencode(self.uid.as_ref()));
+        self.service.get(url).await
+    }
+
    pub async fn update_settings(&self, settings: Value) -> (Value, StatusCode) {
-        self._update_settings(settings).await
+        let url = format!("/indexes/{}/settings", urlencode(self.uid.as_ref()));
+        self.service.patch_encoded(url, settings, self.encoder).await
    }

    pub async fn update_settings_displayed_attributes(
@@ -248,146 +327,6 @@ impl<'a> Index<'a, Owned> {
        self.service.delete(url).await
    }

-    pub async fn update_distinct_attribute(&self, value: Value) -> (Value, StatusCode) {
-        let url =
-            format!("/indexes/{}/settings/{}", urlencode(self.uid.as_ref()), "distinct-attribute");
-        self.service.put_encoded(url, value, self.encoder).await
-    }
-}
-
-impl<'a> Index<'a, Shared> {
-    /// You cannot modify the content of a shared index, thus the delete_document_by_filter call
-    /// must fail. If the task successfully enqueue itself, we'll wait for the task to finishes,
-    /// and if it succeed the function will panic.
-    pub async fn delete_document_by_filter_fail(&self, body: Value) -> (Value, StatusCode) {
-        let (mut task, code) = self._delete_document_by_filter(body).await;
-        if code.is_success() {
-            task = self.wait_task(task.uid()).await;
-            if task.is_success() {
-                panic!(
-                    "`delete_document_by_filter_fail` succeeded: {}",
-                    serde_json::to_string_pretty(&task).unwrap()
-                );
-            }
-        }
-        (task, code)
-    }
-}
-
-#[allow(dead_code)]
-impl<State> Index<'_, State> {
-    pub async fn get(&self) -> (Value, StatusCode) {
-        let url = format!("/indexes/{}", urlencode(self.uid.as_ref()));
-        self.service.get(url).await
-    }
-
-    /// add_documents is not allowed on shared index but we need to use it to initialize
-    /// a bunch of very common indexes in `common/mod.rs`.
-    pub(super) async fn _add_documents(
-        &self,
-        documents: Value,
-        primary_key: Option<&str>,
-    ) -> (Value, StatusCode) {
-        let url = match primary_key {
-            Some(key) => {
-                format!("/indexes/{}/documents?primaryKey={}", urlencode(self.uid.as_ref()), key)
-            }
-            None => format!("/indexes/{}/documents", urlencode(self.uid.as_ref())),
-        };
-        self.service.post_encoded(url, documents, self.encoder).await
-    }
-
-    pub(super) async fn _update_settings(&self, settings: Value) -> (Value, StatusCode) {
-        let url = format!("/indexes/{}/settings", urlencode(self.uid.as_ref()));
-        self.service.patch_encoded(url, settings, self.encoder).await
-    }
-
-    pub(super) async fn _delete_document_by_filter(&self, body: Value) -> (Value, StatusCode) {
-        let url = format!("/indexes/{}/documents/delete", urlencode(self.uid.as_ref()));
-        self.service.post_encoded(url, body, self.encoder).await
-    }
-
-    pub(super) async fn _create(&self, primary_key: Option<&str>) -> (Value, StatusCode) {
-        let body = json!({
-            "uid": self.uid,
-            "primaryKey": primary_key,
-        });
-        self.service.post_encoded("/indexes", body, self.encoder).await
-    }
-    pub async fn wait_task(&self, update_id: u64) -> Value {
-        // try several times to get status, or panic to not wait forever
-        let url = format!("/tasks/{}", update_id);
-        for _ in 0..100 {
-            let (response, status_code) = self.service.get(&url).await;
-            assert_eq!(200, status_code, "response: {}", response);
-
-            if response["status"] == "succeeded" || response["status"] == "failed" {
-                return response;
-            }
-
-            // wait 0.5 second.
-            sleep(Duration::from_millis(500)).await;
-        }
-        panic!("Timeout waiting for update id");
-    }
-
-    pub async fn get_task(&self, update_id: u64) -> (Value, StatusCode) {
-        let url = format!("/tasks/{}", update_id);
-        self.service.get(url).await
-    }
-
-    pub async fn filtered_tasks(
-        &self,
-        types: &[&str],
-        statuses: &[&str],
-        canceled_by: &[&str],
-    ) -> (Value, StatusCode) {
-        let mut url = format!("/tasks?indexUids={}", self.uid);
-        if !types.is_empty() {
-            let _ = write!(url, "&types={}", types.join(","));
-        }
-        if !statuses.is_empty() {
-            let _ = write!(url, "&statuses={}", statuses.join(","));
-        }
-        if !canceled_by.is_empty() {
-            let _ = write!(url, "&canceledBy={}", canceled_by.join(","));
-        }
-        self.service.get(url).await
-    }
-
-    pub async fn get_document(&self, id: u64, options: Option<Value>) -> (Value, StatusCode) {
-        let mut url = format!("/indexes/{}/documents/{}", urlencode(self.uid.as_ref()), id);
-        if let Some(options) = options {
-            write!(url, "{}", yaup::to_string(&options).unwrap()).unwrap();
-        }
-        self.service.get(url).await
-    }
-
-    pub async fn get_document_by_filter(&self, payload: Value) -> (Value, StatusCode) {
-        let url = format!("/indexes/{}/documents/fetch", urlencode(self.uid.as_ref()));
-        self.service.post(url, payload).await
-    }
-
-    pub async fn get_all_documents_raw(&self, options: &str) -> (Value, StatusCode) {
-        let url = format!("/indexes/{}/documents{}", urlencode(self.uid.as_ref()), options);
-        self.service.get(url).await
-    }
-
-    pub async fn get_all_documents(&self, options: GetAllDocumentsOptions) -> (Value, StatusCode) {
-        let url = format!(
-            "/indexes/{}/documents{}",
-            urlencode(self.uid.as_ref()),
-            yaup::to_string(&options).unwrap()
-        );
-
-        self.service.get(url).await
-    }
-
-    pub async fn settings(&self) -> (Value, StatusCode) {
-        let url = format!("/indexes/{}/settings", urlencode(self.uid.as_ref()));
-        self.service.get(url).await
-    }
-
    pub async fn stats(&self) -> (Value, StatusCode) {
        let url = format!("/indexes/{}/stats", urlencode(self.uid.as_ref()));
        self.service.get(url).await
@@ -472,6 +411,12 @@ impl<State> Index<'_, State> {
        self.service.post_encoded(url, query, self.encoder).await
    }

+    pub async fn update_distinct_attribute(&self, value: Value) -> (Value, StatusCode) {
+        let url =
+            format!("/indexes/{}/settings/{}", urlencode(self.uid.as_ref()), "distinct-attribute");
+        self.service.put_encoded(url, value, self.encoder).await
+    }
+
    pub async fn get_distinct_attribute(&self) -> (Value, StatusCode) {
        let url =
            format!("/indexes/{}/settings/{}", urlencode(self.uid.as_ref()), "distinct-attribute");
--- a/meilisearch/tests/common/mod.rs
+++ b/meilisearch/tests/common/mod.rs
@@ -8,16 +8,9 @@ use std::fmt::{self, Display};
 #[allow(unused)]
 pub use index::GetAllDocumentsOptions;
 use meili_snap::json_string;
-use once_cell::sync::Lazy;
 use serde::{Deserialize, Serialize};
 #[allow(unused)]
 pub use server::{default_settings, Server};
-use tokio::sync::OnceCell;
-
-use crate::common::index::Index;
-
-pub enum Shared {}
-pub enum Owned {}

 #[derive(Debug, Clone, Default, Serialize, Deserialize, PartialEq, Eq)]
 pub struct Value(pub serde_json::Value);
@@ -34,20 +27,10 @@ impl Value {
        }
    }

-    /// Return `true` if the `status` field is set to `succeeded`.
-    /// Panic if the `status` field doesn't exists.
-    #[track_caller]
-    pub fn is_success(&self) -> bool {
-        if !self["status"].is_string() {
-            panic!("Called `is_success` on {}", serde_json::to_string_pretty(&self.0).unwrap());
-        }
-        self["status"] == serde_json::Value::String(String::from("succeeded"))
-    }
-
    // Panic if the json doesn't contain the `status` field set to "succeeded"
    #[track_caller]
    pub fn succeeded(&self) -> &Self {
-        if !self.is_success() {
+        if self["status"] != serde_json::Value::String(String::from("succeeded")) {
            panic!("Called succeeded on {}", serde_json::to_string_pretty(&self.0).unwrap());
        }
        self
@@ -97,15 +80,7 @@ impl Display for Value {
        write!(
            f,
            "{}",
-            json_string!(self, {
-                ".uid" => "[uid]",
-                ".enqueuedAt" => "[date]",
-                ".startedAt" => "[date]",
-                ".finishedAt" => "[date]",
-                ".duration" => "[duration]",
-                ".processingTimeMs" => "[duration]",
-                ".details.embedders.*.url" => "[url]"
-            })
+            json_string!(self, { ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]", ".duration" => "[duration]", ".processingTimeMs" => "[duration]" })
        )
    }
 }
@@ -139,253 +114,3 @@ macro_rules! test_post_get_search {
            .map_err(|e| panic!("panic in post route: {:?}", e.downcast_ref::<&str>().unwrap()));
    };
 }
-
-pub async fn shared_does_not_exists_index() -> &'static Index<'static, Shared> {
-    static INDEX: Lazy<Index<'static, Shared>> = Lazy::new(|| {
-        let server = Server::new_shared();
-        server._index("DOES_NOT_EXISTS").to_shared()
-    });
-    &INDEX
-}
-
-pub async fn shared_empty_index() -> &'static Index<'static, Shared> {
-    static INDEX: OnceCell<Index<'static, Shared>> = OnceCell::const_new();
-
-    INDEX
-        .get_or_init(|| async {
-            let server = Server::new_shared();
-            let index = server._index("EMPTY_INDEX").to_shared();
-            let (response, _code) = index._create(None).await;
-            index.wait_task(response.uid()).await.succeeded();
-            index
-        })
-        .await
-}
-
-pub static DOCUMENTS: Lazy<Value> = Lazy::new(|| {
-    json!([
-        {
-            "title": "Shazam!",
-            "id": "287947",
-            "color": ["green", "blue"],
-            "_vectors": { "manual": [1, 2, 3]},
-        },
-        {
-            "title": "Captain Marvel",
-            "id": "299537",
-            "color": ["yellow", "blue"],
-            "_vectors": { "manual": [1, 2, 54] },
-        },
-        {
-            "title": "Escape Room",
-            "id": "522681",
-            "color": ["yellow", "red"],
-            "_vectors": { "manual": [10, -23, 32] },
-        },
-        {
-            "title": "How to Train Your Dragon: The Hidden World",
-            "id": "166428",
-            "color": ["green", "red"],
-            "_vectors": { "manual": [-100, 231, 32] },
-        },
-        {
-            "title": "Gläss",
-            "id": "450465",
-            "color": ["blue", "red"],
-            "_vectors": { "manual": [-100, 340, 90] },
-        }
-    ])
-});
-
-pub async fn shared_index_with_documents() -> &'static Index<'static, Shared> {
-    static INDEX: OnceCell<Index<'static, Shared>> = OnceCell::const_new();
-    INDEX.get_or_init(|| async {
-        let server = Server::new_shared();
-        let index = server._index("SHARED_DOCUMENTS").to_shared();
-        let documents = DOCUMENTS.clone();
-        let (response, _code) = index._add_documents(documents, None).await;
-        index.wait_task(response.uid()).await.succeeded();
-        let (response, _code) = index
-            ._update_settings(
-                json!({"filterableAttributes": ["id", "title"], "sortableAttributes": ["id", "title"]}),
-            )
-            .await;
-        index.wait_task(response.uid()).await.succeeded();
-        index
-    }).await
-}
-
-pub static SCORE_DOCUMENTS: Lazy<Value> = Lazy::new(|| {
-    json!([
-        {
-            "title": "Batman the dark knight returns: Part 1",
-            "id": "A",
-        },
-        {
-            "title": "Batman the dark knight returns: Part 2",
-            "id": "B",
-        },
-        {
-            "title": "Batman Returns",
-            "id": "C",
-        },
-        {
-            "title": "Batman",
-            "id": "D",
-        },
-        {
-            "title": "Badman",
-            "id": "E",
-        }
-    ])
-});
-
-pub static NESTED_DOCUMENTS: Lazy<Value> = Lazy::new(|| {
-    json!([
-        {
-            "id": 852,
-            "father": "jean",
-            "mother": "michelle",
-            "doggos": [
-                {
-                    "name": "bobby",
-                    "age": 2,
-                },
-                {
-                    "name": "buddy",
-                    "age": 4,
-                },
-            ],
-            "cattos": "pésti",
-            "_vectors": { "manual": [1, 2, 3]},
-        },
-        {
-            "id": 654,
-            "father": "pierre",
-            "mother": "sabine",
-            "doggos": [
-                {
-                    "name": "gros bill",
-                    "age": 8,
-                },
-            ],
-            "cattos": ["simba", "pestiféré"],
-            "_vectors": { "manual": [1, 2, 54] },
-        },
-        {
-            "id": 750,
-            "father": "romain",
-            "mother": "michelle",
-            "cattos": ["enigma"],
-            "_vectors": { "manual": [10, 23, 32] },
-        },
-        {
-            "id": 951,
-            "father": "jean-baptiste",
-            "mother": "sophie",
-            "doggos": [
-                {
-                    "name": "turbo",
-                    "age": 5,
-                },
-                {
-                    "name": "fast",
-                    "age": 6,
-                },
-            ],
-            "cattos": ["moumoute", "gomez"],
-            "_vectors": { "manual": [10, 23, 32] },
-        },
-    ])
-});
-
-pub async fn shared_index_with_nested_documents() -> &'static Index<'static, Shared> {
-    static INDEX: OnceCell<Index<'static, Shared>> = OnceCell::const_new();
-    INDEX.get_or_init(|| async {
-        let server = Server::new_shared();
-        let index = server._index("SHARED_NESTED_DOCUMENTS").to_shared();
-        let documents = NESTED_DOCUMENTS.clone();
-        let (response, _code) = index._add_documents(documents, None).await;
-        index.wait_task(response.uid()).await.succeeded();
-        let (response, _code) = index
-            ._update_settings(
-                json!({"filterableAttributes": ["father", "doggos"], "sortableAttributes": ["doggos"]}),
-            )
-            .await;
-        index.wait_task(response.uid()).await.succeeded();
-        index
-    }).await
-}
-
-pub static FRUITS_DOCUMENTS: Lazy<Value> = Lazy::new(|| {
-    json!([
-        {
-            "name": "Exclusive sale: green apple",
-            "id": "green-apple-boosted",
-            "BOOST": true
-        },
-        {
-            "name": "Pear",
-            "id": "pear",
-        },
-        {
-            "name": "Red apple gala",
-            "id": "red-apple-gala",
-        },
-        {
-            "name": "Exclusive sale: Red Tomato",
-            "id": "red-tomatoes-boosted",
-            "BOOST": true
-        },
-        {
-            "name": "Exclusive sale: Red delicious apple",
-            "id": "red-delicious-boosted",
-            "BOOST": true,
-        }
-    ])
-});
-
-pub static VECTOR_DOCUMENTS: Lazy<Value> = Lazy::new(|| {
-    json!([
-      {
-        "id": "A",
-        "description": "the dog barks at the cat",
-        "_vectors": {
-          // dimensions [canine, feline, young]
-          "animal": [0.9, 0.8, 0.05],
-          // dimensions [negative/positive, energy]
-          "sentiment": [-0.1, 0.55]
-        }
-      },
-      {
-        "id": "B",
-        "description": "the kitten scratched the beagle",
-        "_vectors": {
-          // dimensions [canine, feline, young]
-          "animal": [0.8, 0.9, 0.5],
-          // dimensions [negative/positive, energy]
-          "sentiment": [-0.2, 0.65]
-        }
-      },
-      {
-        "id": "C",
-        "description": "the dog had to stay alone today",
-        "_vectors": {
-          // dimensions [canine, feline, young]
-          "animal": [0.85, 0.02, 0.1],
-          // dimensions [negative/positive, energy]
-          "sentiment": [-1.0, 0.1]
-        }
-      },
-      {
-        "id": "D",
-        "description": "the little boy pets the puppy",
-        "_vectors": {
-          // dimensions [canine, feline, young]
-          "animal": [0.8, 0.09, 0.8],
-          // dimensions [negative/positive, energy]
-          "sentiment": [0.8, 0.3]
-        }
-      },
-    ])
-});
--- a/meilisearch/tests/common/server.rs
+++ b/meilisearch/tests/common/server.rs
@@ -1,8 +1,6 @@
 #![allow(dead_code)]

-use std::marker::PhantomData;
 use std::path::Path;
-use std::str::FromStr;
 use std::time::Duration;

 use actix_http::body::MessageBody;
@@ -10,35 +8,29 @@ use actix_web::dev::ServiceResponse;
 use actix_web::http::StatusCode;
 use byte_unit::{Byte, Unit};
 use clap::Parser;
-use meilisearch::option::{IndexerOpts, MaxMemory, MaxThreads, Opt};
-use meilisearch::setup_meilisearch;
+use meilisearch::option::{IndexerOpts, MaxMemory, Opt};
+use meilisearch::{analytics, create_app, setup_meilisearch, SubscriberForSecondLayer};
 use once_cell::sync::Lazy;
 use tempfile::TempDir;
-use tokio::sync::OnceCell;
 use tokio::time::sleep;
-use uuid::Uuid;
+use tracing::level_filters::LevelFilter;
+use tracing_subscriber::Layer;

 use super::index::Index;
 use super::service::Service;
-use super::{Owned, Shared};
 use crate::common::encoder::Encoder;
 use crate::common::Value;
 use crate::json;

-pub struct Server<State = Owned> {
+pub struct Server {
    pub service: Service,
    // hold ownership to the tempdir while we use the server instance.
    _dir: Option<TempDir>,
-    _marker: PhantomData<State>,
 }

 pub static TEST_TEMP_DIR: Lazy<TempDir> = Lazy::new(|| TempDir::new().unwrap());

-impl Server<Owned> {
-    fn into_shared(self) -> Server<Shared> {
-        Server { service: self.service, _dir: self._dir, _marker: PhantomData }
-    }
-
+impl Server {
    pub async fn new() -> Self {
        let dir = TempDir::new().unwrap();

@@ -53,7 +45,7 @@ impl Server<Owned> {
        let (index_scheduler, auth) = setup_meilisearch(&options).unwrap();
        let service = Service { index_scheduler, auth, options, api_key: None };

-        Server { service, _dir: Some(dir), _marker: PhantomData }
+        Server { service, _dir: Some(dir) }
    }

    pub async fn new_auth_with_options(mut options: Opt, dir: TempDir) -> Self {
@@ -68,7 +60,7 @@ impl Server<Owned> {
        let (index_scheduler, auth) = setup_meilisearch(&options).unwrap();
        let service = Service { index_scheduler, auth, options, api_key: None };

-        Server { service, _dir: Some(dir), _marker: PhantomData }
+        Server { service, _dir: Some(dir) }
    }

    pub async fn new_auth() -> Self {
@@ -81,35 +73,38 @@ impl Server<Owned> {
        let (index_scheduler, auth) = setup_meilisearch(&options)?;
        let service = Service { index_scheduler, auth, options, api_key: None };

-        Ok(Server { service, _dir: None, _marker: PhantomData })
+        Ok(Server { service, _dir: None })
    }

-    pub fn use_api_key(&mut self, api_key: impl AsRef<str>) {
-        self.service.api_key = Some(api_key.as_ref().to_string());
-    }
+    pub async fn init_web_app(
+        &self,
+    ) -> impl actix_web::dev::Service<
+        actix_http::Request,
+        Response = ServiceResponse<impl MessageBody>,
+        Error = actix_web::Error,
+    > {
+        let (_route_layer, route_layer_handle) =
+            tracing_subscriber::reload::Layer::new(None.with_filter(
+                tracing_subscriber::filter::Targets::new().with_target("", LevelFilter::OFF),
+            ));
+        let (_stderr_layer, stderr_layer_handle) = tracing_subscriber::reload::Layer::new(
+            (Box::new(
+                tracing_subscriber::fmt::layer()
+                    .with_span_events(tracing_subscriber::fmt::format::FmtSpan::CLOSE),
+            )
+                as Box<dyn tracing_subscriber::Layer<SubscriberForSecondLayer> + Send + Sync>)
+                .with_filter(tracing_subscriber::filter::Targets::new()),
+        );

-    /// Fetch and use the default admin key for nexts http requests.
-    pub async fn use_admin_key(&mut self, master_key: impl AsRef<str>) {
-        self.use_api_key(master_key);
-        let (response, code) = self.list_api_keys("").await;
-        assert_eq!(200, code, "{:?}", response);
-        let admin_key = &response["results"][1]["key"];
-        self.use_api_key(admin_key.as_str().unwrap());
-    }
-
-    pub async fn add_api_key(&self, content: Value) -> (Value, StatusCode) {
-        let url = "/keys";
-        self.service.post(url, content).await
-    }
-
-    pub async fn patch_api_key(&self, key: impl AsRef<str>, content: Value) -> (Value, StatusCode) {
-        let url = format!("/keys/{}", key.as_ref());
-        self.service.patch(url, content).await
-    }
-
-    pub async fn delete_api_key(&self, key: impl AsRef<str>) -> (Value, StatusCode) {
-        let url = format!("/keys/{}", key.as_ref());
-        self.service.delete(url).await
+        actix_web::test::init_service(create_app(
+            self.service.index_scheduler.clone().into(),
+            self.service.auth.clone().into(),
+            self.service.options.clone(),
+            (route_layer_handle, stderr_layer_handle),
+            analytics::MockAnalytics::new(&self.service.options),
+            true,
+        ))
+        .await
    }

    /// Returns a view to an index. There is no guarantee that the index exists.
@@ -122,12 +117,15 @@ impl Server<Owned> {
    }

    pub fn index_with_encoder(&self, uid: impl AsRef<str>, encoder: Encoder) -> Index<'_> {
-        Index {
-            uid: uid.as_ref().to_string(),
-            service: &self.service,
-            encoder,
-            marker: PhantomData,
-        }
+        Index { uid: uid.as_ref().to_string(), service: &self.service, encoder }
+    }
+
+    pub async fn multi_search(&self, queries: Value) -> (Value, StatusCode) {
+        self.service.post("/multi-search", queries).await
+    }
+
+    pub async fn list_indexes_raw(&self, parameters: &str) -> (Value, StatusCode) {
+        self.service.get(format!("/indexes{parameters}")).await
    }

    pub async fn list_indexes(
@@ -151,6 +149,10 @@ impl Server<Owned> {
        }
    }

+    pub async fn version(&self) -> (Value, StatusCode) {
+        self.service.get("/version").await
+    }
+
    pub async fn stats(&self) -> (Value, StatusCode) {
        self.service.get("/stats").await
    }
@@ -159,174 +161,12 @@ impl Server<Owned> {
        self.service.get("/tasks").await
    }

-    pub async fn set_features(&self, value: Value) -> (Value, StatusCode) {
-        self.service.patch("/experimental-features", value).await
-    }
-
-    pub async fn get_metrics(&self) -> (Value, StatusCode) {
-        self.service.get("/metrics").await
-    }
-}
-
-impl Server<Shared> {
-    fn init_new_shared_instance() -> Server<Shared> {
-        let dir = TempDir::new().unwrap();
-
-        if cfg!(windows) {
-            std::env::set_var("TMP", TEST_TEMP_DIR.path());
-        } else {
-            std::env::set_var("TMPDIR", TEST_TEMP_DIR.path());
-        }
-
-        let options = default_settings(dir.path());
-
-        let (index_scheduler, auth) = setup_meilisearch(&options).unwrap();
-        let service = Service { index_scheduler, auth, api_key: None, options };
-
-        Server { service, _dir: Some(dir), _marker: PhantomData }
-    }
-
-    pub fn new_shared() -> &'static Server<Shared> {
-        static SERVER: Lazy<Server<Shared>> = Lazy::new(Server::init_new_shared_instance);
-        &SERVER
-    }
-
-    pub async fn new_shared_with_admin_key() -> &'static Server<Shared> {
-        static SERVER: OnceCell<Server<Shared>> = OnceCell::const_new();
-        SERVER
-            .get_or_init(|| async {
-                let mut server = Server::new_auth().await;
-                server.use_admin_key("MASTER_KEY").await;
-                server.into_shared()
-            })
-            .await
-    }
-
-    /// You shouldn't access random indexes on a shared instance thus this method
-    /// must fail.
-    pub async fn get_index_fail(&self, uid: impl AsRef<str>) -> (Value, StatusCode) {
-        let url = format!("/indexes/{}", urlencoding::encode(uid.as_ref()));
-        let (value, code) = self.service.get(url).await;
-        if code.is_success() {
-            panic!("`get_index_fail` succeeded with uid: {}", uid.as_ref());
-        }
-        (value, code)
-    }
-
-    pub async fn delete_index_fail(&self, uid: impl AsRef<str>) -> (Value, StatusCode) {
-        let url = format!("/indexes/{}", urlencoding::encode(uid.as_ref()));
-        let (value, code) = self.service.delete(url).await;
-        if code.is_success() {
-            panic!("`delete_index_fail` succeeded with uid: {}", uid.as_ref());
-        }
-        (value, code)
-    }
-
-    pub async fn update_raw_index_fail(
-        &self,
-        uid: impl AsRef<str>,
-        body: Value,
-    ) -> (Value, StatusCode) {
-        let url = format!("/indexes/{}", urlencoding::encode(uid.as_ref()));
-        let (value, code) = self.service.patch_encoded(url, body, Encoder::Plain).await;
-        if code.is_success() {
-            panic!("`update_raw_index_fail` succeeded with uid: {}", uid.as_ref());
-        }
-        (value, code)
-    }
-
-    /// Since this call updates the state of the instance, it must fail.
-    /// If it doesn't fail, the test will panic to help you debug what
-    /// is going on.
-    pub async fn create_index_fail(&self, body: Value) -> (Value, StatusCode) {
-        let (mut task, code) = self._create_index(body).await;
-        if code.is_success() {
-            task = self.wait_task(task.uid()).await;
-            if task.is_success() {
-                panic!(
-                    "`create_index_fail` succeeded: {}",
-                    serde_json::to_string_pretty(&task).unwrap()
-                );
-            }
-        }
-        (task, code)
-    }
-}
-
-impl<State> Server<State> {
-    pub async fn init_web_app(
-        &self,
-    ) -> impl actix_web::dev::Service<
-        actix_http::Request,
-        Response = ServiceResponse<impl MessageBody>,
-        Error = actix_web::Error,
-    > {
-        self.service.init_web_app().await
-    }
-
-    pub async fn list_api_keys(&self, params: &str) -> (Value, StatusCode) {
-        let url = format!("/keys{params}");
-        self.service.get(url).await
-    }
-
-    pub async fn dummy_request(
-        &self,
-        method: impl AsRef<str>,
-        url: impl AsRef<str>,
-    ) -> (Value, StatusCode) {
-        match method.as_ref() {
-            "POST" => self.service.post(url, json!({})).await,
-            "PUT" => self.service.put(url, json!({})).await,
-            "PATCH" => self.service.patch(url, json!({})).await,
-            "GET" => self.service.get(url).await,
-            "DELETE" => self.service.delete(url).await,
-            _ => unreachable!(),
-        }
-    }
-
-    pub async fn get_api_key(&self, key: impl AsRef<str>) -> (Value, StatusCode) {
-        let url = format!("/keys/{}", key.as_ref());
-        self.service.get(url).await
-    }
-
-    pub(super) fn _index(&self, uid: impl AsRef<str>) -> Index<'_> {
-        Index {
-            uid: uid.as_ref().to_string(),
-            service: &self.service,
-            encoder: Encoder::Plain,
-            marker: PhantomData,
-        }
-    }
-
-    /// Returns a view to an index. There is no guarantee that the index exists.
-    pub fn unique_index(&self) -> Index<'_> {
-        let uuid = Uuid::new_v4();
-        Index {
-            uid: uuid.to_string(),
-            service: &self.service,
-            encoder: Encoder::Plain,
-            marker: PhantomData,
-        }
-    }
-
-    pub(super) async fn _create_index(&self, body: Value) -> (Value, StatusCode) {
-        self.service.post("/indexes", body).await
-    }
-
-    pub async fn multi_search(&self, queries: Value) -> (Value, StatusCode) {
-        self.service.post("/multi-search", queries).await
-    }
-
-    pub async fn list_indexes_raw(&self, parameters: &str) -> (Value, StatusCode) {
-        self.service.get(format!("/indexes{parameters}")).await
-    }
-
    pub async fn tasks_filter(&self, filter: &str) -> (Value, StatusCode) {
        self.service.get(format!("/tasks?{}", filter)).await
    }

-    pub async fn version(&self) -> (Value, StatusCode) {
-        self.service.get("/version").await
+    pub async fn get_dump_status(&self, uid: &str) -> (Value, StatusCode) {
+        self.service.get(format!("/dumps/{}/status", uid)).await
    }

    pub async fn create_dump(&self) -> (Value, StatusCode) {
@@ -374,6 +214,14 @@ impl<State> Server<State> {
    pub async fn get_features(&self) -> (Value, StatusCode) {
        self.service.get("/experimental-features").await
    }
+
+    pub async fn set_features(&self, value: Value) -> (Value, StatusCode) {
+        self.service.patch("/experimental-features", value).await
+    }
+
+    pub async fn get_metrics(&self) -> (Value, StatusCode) {
+        self.service.get("/metrics").await
+    }
 }

 pub fn default_settings(dir: impl AsRef<Path>) -> Opt {
@@ -391,8 +239,7 @@ pub fn default_settings(dir: impl AsRef<Path>) -> Opt {
            // memory has to be unlimited because several meilisearch are running in test context.
            max_indexing_memory: MaxMemory::unlimited(),
            skip_index_budget: true,
-            // Having 2 threads makes the tests way faster
-            max_indexing_threads: MaxThreads::from_str("2").unwrap(),
+            ..Parser::parse_from(None as Option<&str>)
        },
        experimental_enable_metrics: false,
        ..Parser::parse_from(None as Option<&str>)
--- a/meilisearch/tests/common/service.rs
+++ b/meilisearch/tests/common/service.rs
@@ -1,15 +1,10 @@
-use std::num::NonZeroUsize;
 use std::sync::Arc;

-use actix_web::body::MessageBody;
-use actix_web::dev::ServiceResponse;
 use actix_web::http::header::ContentType;
 use actix_web::http::StatusCode;
 use actix_web::test;
 use actix_web::test::TestRequest;
-use actix_web::web::Data;
 use index_scheduler::IndexScheduler;
-use meilisearch::search_queue::SearchQueue;
 use meilisearch::{analytics, create_app, Opt, SubscriberForSecondLayer};
 use meilisearch_auth::AuthController;
 use tracing::level_filters::LevelFilter;
@@ -111,13 +106,7 @@ impl Service {
        self.request(req).await
    }

-    pub async fn init_web_app(
-        &self,
-    ) -> impl actix_web::dev::Service<
-        actix_http::Request,
-        Response = ServiceResponse<impl MessageBody>,
-        Error = actix_web::Error,
-    > {
+    pub async fn request(&self, mut req: test::TestRequest) -> (Value, StatusCode) {
        let (_route_layer, route_layer_handle) =
            tracing_subscriber::reload::Layer::new(None.with_filter(
                tracing_subscriber::filter::Targets::new().with_target("", LevelFilter::OFF),
@@ -130,25 +119,16 @@ impl Service {
                as Box<dyn tracing_subscriber::Layer<SubscriberForSecondLayer> + Send + Sync>)
                .with_filter(tracing_subscriber::filter::Targets::new()),
        );
-        let search_queue = SearchQueue::new(
-            self.options.experimental_search_queue_size,
-            NonZeroUsize::new(1).unwrap(),
-        );

-        actix_web::test::init_service(create_app(
+        let app = test::init_service(create_app(
            self.index_scheduler.clone().into(),
            self.auth.clone().into(),
-            Data::new(search_queue),
            self.options.clone(),
            (route_layer_handle, stderr_layer_handle),
            analytics::MockAnalytics::new(&self.options),
            true,
        ))
-        .await
-    }
-
-    pub async fn request(&self, mut req: test::TestRequest) -> (Value, StatusCode) {
-        let app = self.init_web_app().await;
+        .await;

        if let Some(api_key) = &self.api_key {
            req = req.insert_header(("Authorization", ["Bearer ", api_key].concat()));
--- a/meilisearch/tests/content_type.rs
+++ b/meilisearch/tests/content_type.rs
@@ -6,7 +6,6 @@ use actix_web::test;

 use crate::common::{Server, Value};

-#[derive(Debug)]
 enum HttpVerb {
    Put,
    Patch,
@@ -81,7 +80,7 @@ async fn error_json_bad_content_type() {
        let status_code = res.status();
        let body = test::read_body(res).await;
        let response: Value = serde_json::from_slice(&body).unwrap_or_default();
-        assert_eq!(status_code, 415, "calling the route `{verb:?} {route}` without content-type is supposed to throw a bad media type error:\n{}", String::from_utf8_lossy(&body));
+        assert_eq!(status_code, 415, "calling the route `{}` without content-type is supposed to throw a bad media type error", route);
        assert_eq!(
            response,
            json!({
--- a/meilisearch/tests/documents/add_documents.rs
+++ b/meilisearch/tests/documents/add_documents.rs
@@ -1110,7 +1110,7 @@ async fn document_addition_with_huge_int_primary_key() {
    snapshot!(response,
        @r###"
    {
-      "uid": "[uid]",
+      "uid": 0,
      "indexUid": "test",
      "status": "succeeded",
      "type": "documentAdditionOrUpdate",
@@ -1402,7 +1402,7 @@ async fn error_document_field_limit_reached_over_multiple_documents() {
    snapshot!(response,
        @r###"
    {
-      "uid": "[uid]",
+      "uid": 1,
      "indexUid": "test",
      "status": "succeeded",
      "type": "documentAdditionOrUpdate",
@@ -1436,7 +1436,7 @@ async fn error_document_field_limit_reached_over_multiple_documents() {
    snapshot!(response,
        @r###"
    {
-      "uid": "[uid]",
+      "uid": 2,
      "indexUid": "test",
      "status": "failed",
      "type": "documentAdditionOrUpdate",
@@ -1485,7 +1485,7 @@ async fn error_document_field_limit_reached_in_one_nested_document() {
    snapshot!(response,
        @r###"
    {
-      "uid": "[uid]",
+      "uid": 1,
      "indexUid": "test",
      "status": "succeeded",
      "type": "documentAdditionOrUpdate",
@@ -1528,7 +1528,7 @@ async fn error_document_field_limit_reached_over_multiple_documents_with_nested_
    snapshot!(response,
        @r###"
    {
-      "uid": "[uid]",
+      "uid": 1,
      "indexUid": "test",
      "status": "succeeded",
      "type": "documentAdditionOrUpdate",
@@ -1563,7 +1563,7 @@ async fn error_document_field_limit_reached_over_multiple_documents_with_nested_
    snapshot!(response,
        @r###"
    {
-      "uid": "[uid]",
+      "uid": 2,
      "indexUid": "test",
      "status": "succeeded",
      "type": "documentAdditionOrUpdate",
@@ -2209,7 +2209,7 @@ async fn add_invalid_geo_and_then_settings() {
    let ret = index.wait_task(ret.uid()).await;
    snapshot!(ret, @r###"
    {
-      "uid": "[uid]",
+      "uid": 1,
      "indexUid": "test",
      "status": "succeeded",
      "type": "documentAdditionOrUpdate",
@@ -2231,7 +2231,7 @@ async fn add_invalid_geo_and_then_settings() {
    let ret = index.wait_task(ret.uid()).await;
    snapshot!(ret, @r###"
    {
-      "uid": "[uid]",
+      "uid": 2,
      "indexUid": "test",
      "status": "failed",
      "type": "settingsUpdate",
--- a/meilisearch/tests/documents/errors.rs
+++ b/meilisearch/tests/documents/errors.rs
@@ -1,15 +1,14 @@
 use meili_snap::*;
 use urlencoding::encode;

-use crate::common::{
-    shared_does_not_exists_index, shared_empty_index, shared_index_with_documents, Server,
-};
+use crate::common::Server;
 use crate::json;

 #[actix_rt::test]
 async fn get_all_documents_bad_offset() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");
+
    let (response, code) = index.get_all_documents_raw("?offset").await;
    snapshot!(code, @"400 Bad Request");
    snapshot!(json_string!(response), @r###"
@@ -46,8 +45,9 @@ async fn get_all_documents_bad_offset() {

 #[actix_rt::test]
 async fn get_all_documents_bad_limit() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");
+
    let (response, code) = index.get_all_documents_raw("?limit").await;
    snapshot!(code, @"400 Bad Request");
    snapshot!(json_string!(response), @r###"
@@ -84,13 +84,17 @@ async fn get_all_documents_bad_limit() {

 #[actix_rt::test]
 async fn get_all_documents_bad_filter() {
-    let index = shared_does_not_exists_index().await;
+    let server = Server::new().await;
+    let index = server.index("test");

+    // Since the filter can't be parsed automatically by deserr, we have the wrong error message
+    // if the index does not exist: we could expect to get an error message about the invalid filter before
+    // the existence of the index is checked, but it is not the case.
    let (response, code) = index.get_all_documents_raw("?filter").await;
    snapshot!(code, @"404 Not Found");
    snapshot!(json_string!(response), @r###"
    {
-      "message": "Index `DOES_NOT_EXISTS` not found.",
+      "message": "Index `test` not found.",
      "code": "index_not_found",
      "type": "invalid_request",
      "link": "https://docs.meilisearch.com/errors#index_not_found"
@@ -101,7 +105,7 @@ async fn get_all_documents_bad_filter() {
    snapshot!(code, @"404 Not Found");
    snapshot!(json_string!(response), @r###"
    {
-      "message": "Index `DOES_NOT_EXISTS` not found.",
+      "message": "Index `test` not found.",
      "code": "index_not_found",
      "type": "invalid_request",
      "link": "https://docs.meilisearch.com/errors#index_not_found"
@@ -112,14 +116,42 @@ async fn get_all_documents_bad_filter() {
    snapshot!(code, @"404 Not Found");
    snapshot!(json_string!(response), @r###"
    {
-      "message": "Index `DOES_NOT_EXISTS` not found.",
+      "message": "Index `test` not found.",
      "code": "index_not_found",
      "type": "invalid_request",
      "link": "https://docs.meilisearch.com/errors#index_not_found"
    }
    "###);

-    let index = shared_empty_index().await;
+    let (response, code) = index.create(None).await;
+    snapshot!(code, @"202 Accepted");
+    snapshot!(json_string!(response, { ".enqueuedAt" => "[date]" }), @r###"
+    {
+      "taskUid": 0,
+      "indexUid": "test",
+      "status": "enqueued",
+      "type": "indexCreation",
+      "enqueuedAt": "[date]"
+    }
+    "###);
+    let response = server.wait_task(0).await;
+    snapshot!(json_string!(response, { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]" }), @r###"
+    {
+      "uid": 0,
+      "indexUid": "test",
+      "status": "succeeded",
+      "type": "indexCreation",
+      "canceledBy": null,
+      "details": {
+        "primaryKey": null
+      },
+      "error": null,
+      "duration": "[duration]",
+      "enqueuedAt": "[date]",
+      "startedAt": "[date]",
+      "finishedAt": "[date]"
+    }
+    "###);

    let (response, code) = index.get_all_documents_raw("?filter").await;
    snapshot!(code, @"200 OK");
@@ -136,7 +168,7 @@ async fn get_all_documents_bad_filter() {
    snapshot!(code, @"400 Bad Request");
    snapshot!(json_string!(response), @r###"
    {
-      "message": "Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `IN`, `NOT IN`, `TO`, `EXISTS`, `NOT EXISTS`, `IS NULL`, `IS NOT NULL`, `IS EMPTY`, `IS NOT EMPTY`, `CONTAINS`, `NOT CONTAINS`, `STARTS WITH`, `NOT STARTS WITH`, `_geoRadius`, or `_geoBoundingBox` at `doggo`.\n1:6 doggo",
+      "message": "Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `IN`, `NOT IN`, `TO`, `EXISTS`, `NOT EXISTS`, `IS NULL`, `IS NOT NULL`, `IS EMPTY`, `IS NOT EMPTY`, `CONTAINS`, `NOT CONTAINS`, `_geoRadius`, or `_geoBoundingBox` at `doggo`.\n1:6 doggo",
      "code": "invalid_document_filter",
      "type": "invalid_request",
      "link": "https://docs.meilisearch.com/errors#invalid_document_filter"
@@ -157,8 +189,9 @@ async fn get_all_documents_bad_filter() {

 #[actix_rt::test]
 async fn delete_documents_batch() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");
+
    let (response, code) = index.delete_batch_raw(json!("doggo")).await;
    snapshot!(code, @"400 Bad Request");
    snapshot!(json_string!(response), @r###"
@@ -173,8 +206,9 @@ async fn delete_documents_batch() {

 #[actix_rt::test]
 async fn replace_documents_missing_payload() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");
+
    let (response, code) =
        index.raw_add_documents("", vec![("Content-Type", "application/json")], "").await;
    snapshot!(code, @"400 Bad Request");
@@ -214,8 +248,9 @@ async fn replace_documents_missing_payload() {

 #[actix_rt::test]
 async fn update_documents_missing_payload() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");
+
    let (response, code) = index.raw_update_documents("", Some("application/json"), "").await;
    snapshot!(code, @"400 Bad Request");
    snapshot!(json_string!(response), @r###"
@@ -252,8 +287,9 @@ async fn update_documents_missing_payload() {

 #[actix_rt::test]
 async fn replace_documents_missing_content_type() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");
+
    let (response, code) = index.raw_add_documents("", Vec::new(), "").await;
    snapshot!(code, @"415 Unsupported Media Type");
    snapshot!(json_string!(response), @r###"
@@ -280,8 +316,9 @@ async fn replace_documents_missing_content_type() {

 #[actix_rt::test]
 async fn update_documents_missing_content_type() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");
+
    let (response, code) = index.raw_update_documents("", None, "").await;
    snapshot!(code, @"415 Unsupported Media Type");
    snapshot!(json_string!(response), @r###"
@@ -308,8 +345,9 @@ async fn update_documents_missing_content_type() {

 #[actix_rt::test]
 async fn replace_documents_bad_content_type() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");
+
    let (response, code) = index.raw_add_documents("", vec![("Content-Type", "doggo")], "").await;
    snapshot!(code, @"415 Unsupported Media Type");
    snapshot!(json_string!(response), @r###"
@@ -324,8 +362,9 @@ async fn replace_documents_bad_content_type() {

 #[actix_rt::test]
 async fn update_documents_bad_content_type() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");
+
    let (response, code) = index.raw_update_documents("", Some("doggo"), "").await;
    snapshot!(code, @"415 Unsupported Media Type");
    snapshot!(json_string!(response), @r###"
@@ -340,8 +379,9 @@ async fn update_documents_bad_content_type() {

 #[actix_rt::test]
 async fn replace_documents_bad_csv_delimiter() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");
+
    let (response, code) = index
        .raw_add_documents("", vec![("Content-Type", "application/json")], "?csvDelimiter")
        .await;
@@ -388,8 +428,9 @@ async fn replace_documents_bad_csv_delimiter() {

 #[actix_rt::test]
 async fn update_documents_bad_csv_delimiter() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");
+
    let (response, code) =
        index.raw_update_documents("", Some("application/json"), "?csvDelimiter").await;
    snapshot!(code, @"400 Bad Request");
@@ -434,8 +475,9 @@ async fn update_documents_bad_csv_delimiter() {

 #[actix_rt::test]
 async fn replace_documents_csv_delimiter_with_bad_content_type() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");
+
    let (response, code) = index
        .raw_add_documents("", vec![("Content-Type", "application/json")], "?csvDelimiter=a")
        .await;
@@ -465,8 +507,9 @@ async fn replace_documents_csv_delimiter_with_bad_content_type() {

 #[actix_rt::test]
 async fn update_documents_csv_delimiter_with_bad_content_type() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");
+
    let (response, code) =
        index.raw_update_documents("", Some("application/json"), "?csvDelimiter=a").await;
    snapshot!(code, @"415 Unsupported Media Type");
@@ -494,12 +537,13 @@ async fn update_documents_csv_delimiter_with_bad_content_type() {

 #[actix_rt::test]
 async fn delete_document_by_filter() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("doggo");

+    // send a bad payload type
    let (response, code) = index.delete_document_by_filter(json!("hello")).await;
    snapshot!(code, @"400 Bad Request");
-    snapshot!(response, @r###"
+    snapshot!(json_string!(response), @r###"
    {
      "message": "Invalid value type: expected an object, but found a string: `\"hello\"`",
      "code": "bad_request",
@@ -511,7 +555,7 @@ async fn delete_document_by_filter() {
    // send bad payload type
    let (response, code) = index.delete_document_by_filter(json!({ "filter": true })).await;
    snapshot!(code, @"400 Bad Request");
-    snapshot!(response, @r###"
+    snapshot!(json_string!(response), @r###"
    {
      "message": "Invalid syntax for the filter parameter: `expected String, Array, found: true`.",
      "code": "invalid_document_filter",
@@ -523,9 +567,9 @@ async fn delete_document_by_filter() {
    // send bad filter
    let (response, code) = index.delete_document_by_filter(json!({ "filter": "hello"})).await;
    snapshot!(code, @"400 Bad Request");
-    snapshot!(response, @r###"
+    snapshot!(json_string!(response), @r###"
    {
-      "message": "Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `IN`, `NOT IN`, `TO`, `EXISTS`, `NOT EXISTS`, `IS NULL`, `IS NOT NULL`, `IS EMPTY`, `IS NOT EMPTY`, `CONTAINS`, `NOT CONTAINS`, `STARTS WITH`, `NOT STARTS WITH`, `_geoRadius`, or `_geoBoundingBox` at `hello`.\n1:6 hello",
+      "message": "Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `IN`, `NOT IN`, `TO`, `EXISTS`, `NOT EXISTS`, `IS NULL`, `IS NOT NULL`, `IS EMPTY`, `IS NOT EMPTY`, `CONTAINS`, `NOT CONTAINS`, `_geoRadius`, or `_geoBoundingBox` at `hello`.\n1:6 hello",
      "code": "invalid_document_filter",
      "type": "invalid_request",
      "link": "https://docs.meilisearch.com/errors#invalid_document_filter"
@@ -535,7 +579,7 @@ async fn delete_document_by_filter() {
    // send empty filter
    let (response, code) = index.delete_document_by_filter(json!({ "filter": ""})).await;
    snapshot!(code, @"400 Bad Request");
-    snapshot!(response, @r###"
+    snapshot!(json_string!(response), @r###"
    {
      "message": "Sending an empty filter is forbidden.",
      "code": "invalid_document_filter",
@@ -547,7 +591,7 @@ async fn delete_document_by_filter() {
    // do not send any filter
    let (response, code) = index.delete_document_by_filter(json!({})).await;
    snapshot!(code, @"400 Bad Request");
-    snapshot!(response, @r###"
+    snapshot!(json_string!(response), @r###"
    {
      "message": "Missing field `filter`",
      "code": "missing_document_filter",
@@ -556,14 +600,15 @@ async fn delete_document_by_filter() {
    }
    "###);

-    let index = shared_does_not_exists_index().await;
    // index does not exists
-    let (response, _code) =
-        index.delete_document_by_filter_fail(json!({ "filter": "doggo = bernese"})).await;
-    snapshot!(response, @r###"
+    let (response, code) =
+        index.delete_document_by_filter(json!({ "filter": "doggo = bernese"})).await;
+    snapshot!(code, @"202 Accepted");
+    let response = server.wait_task(response["taskUid"].as_u64().unwrap()).await;
+    snapshot!(json_string!(response, { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]"}), @r###"
    {
-      "uid": "[uid]",
-      "indexUid": "DOES_NOT_EXISTS",
+      "uid": 0,
+      "indexUid": "doggo",
      "status": "failed",
      "type": "documentDeletion",
      "canceledBy": null,
@@ -573,7 +618,7 @@ async fn delete_document_by_filter() {
        "originalFilter": "\"doggo = bernese\""
      },
      "error": {
-        "message": "Index `DOES_NOT_EXISTS` not found.",
+        "message": "Index `doggo` not found.",
        "code": "index_not_found",
        "type": "invalid_request",
        "link": "https://docs.meilisearch.com/errors#index_not_found"
@@ -585,14 +630,19 @@ async fn delete_document_by_filter() {
    }
    "###);

+    let (response, code) = index.create(None).await;
+    snapshot!(code, @"202 Accepted");
+    server.wait_task(response["taskUid"].as_u64().unwrap()).await;
+
    // no filterable are set
-    let index = shared_empty_index().await;
-    let (response, _code) =
-        index.delete_document_by_filter_fail(json!({ "filter": "doggo = bernese"})).await;
-    snapshot!(response, @r###"
+    let (response, code) =
+        index.delete_document_by_filter(json!({ "filter": "doggo = bernese"})).await;
+    snapshot!(code, @"202 Accepted");
+    let response = server.wait_task(response["taskUid"].as_u64().unwrap()).await;
+    snapshot!(json_string!(response, { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]"}), @r###"
    {
-      "uid": "[uid]",
-      "indexUid": "EMPTY_INDEX",
+      "uid": 2,
+      "indexUid": "doggo",
      "status": "failed",
      "type": "documentDeletion",
      "canceledBy": null,
@@ -614,16 +664,19 @@ async fn delete_document_by_filter() {
    }
    "###);

-    // not filterable while there is a filterable attribute
-    let index = shared_index_with_documents().await;
-    let (response, code) =
-        index.delete_document_by_filter_fail(json!({ "filter": "catto = jorts"})).await;
+    let (response, code) = index.update_settings_filterable_attributes(json!(["doggo"])).await;
    snapshot!(code, @"202 Accepted");
-    let response = server.wait_task(response.uid()).await;
-    snapshot!(response, @r###"
+    server.wait_task(response["taskUid"].as_u64().unwrap()).await;
+
+    // not filterable while there is a filterable attribute
+    let (response, code) =
+        index.delete_document_by_filter(json!({ "filter": "catto = jorts"})).await;
+    snapshot!(code, @"202 Accepted");
+    let response = server.wait_task(response["taskUid"].as_u64().unwrap()).await;
+    snapshot!(json_string!(response, { ".duration" => "[duration]", ".enqueuedAt" => "[date]", ".startedAt" => "[date]", ".finishedAt" => "[date]"}), @r###"
    {
-      "uid": "[uid]",
-      "indexUid": "SHARED_DOCUMENTS",
+      "uid": 4,
+      "indexUid": "doggo",
      "status": "failed",
      "type": "documentDeletion",
      "canceledBy": null,
@@ -633,7 +686,7 @@ async fn delete_document_by_filter() {
        "originalFilter": "\"catto = jorts\""
      },
      "error": {
-        "message": "Attribute `catto` is not filterable. Available filterable attributes are: `id`, `title`.\n1:6 catto = jorts",
+        "message": "Attribute `catto` is not filterable. Available filterable attributes are: `doggo`.\n1:6 catto = jorts",
        "code": "invalid_document_filter",
        "type": "invalid_request",
        "link": "https://docs.meilisearch.com/errors#invalid_document_filter"
@@ -648,10 +701,10 @@ async fn delete_document_by_filter() {

 #[actix_rt::test]
 async fn fetch_document_by_filter() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("doggo");
    index.update_settings_filterable_attributes(json!(["color"])).await;
-    let (task, _code) = index
+    index
        .add_documents(
            json!([
                { "id": 0, "color": "red" },
@@ -662,7 +715,7 @@ async fn fetch_document_by_filter() {
            Some("id"),
        )
        .await;
-    index.wait_task(task.uid()).await.succeeded();
+    index.wait_task(1).await;

    let (response, code) = index.get_document_by_filter(json!(null)).await;
    snapshot!(code, @"400 Bad Request");
@@ -723,7 +776,7 @@ async fn fetch_document_by_filter() {
    snapshot!(code, @"400 Bad Request");
    snapshot!(response, @r###"
    {
-      "message": "Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `IN`, `NOT IN`, `TO`, `EXISTS`, `NOT EXISTS`, `IS NULL`, `IS NOT NULL`, `IS EMPTY`, `IS NOT EMPTY`, `CONTAINS`, `NOT CONTAINS`, `STARTS WITH`, `NOT STARTS WITH`, `_geoRadius`, or `_geoBoundingBox` at `cool doggo`.\n1:11 cool doggo",
+      "message": "Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `IN`, `NOT IN`, `TO`, `EXISTS`, `NOT EXISTS`, `IS NULL`, `IS NOT NULL`, `IS EMPTY`, `IS NOT EMPTY`, `CONTAINS`, `NOT CONTAINS`, `_geoRadius`, or `_geoBoundingBox` at `cool doggo`.\n1:11 cool doggo",
      "code": "invalid_document_filter",
      "type": "invalid_request",
      "link": "https://docs.meilisearch.com/errors#invalid_document_filter"
@@ -745,7 +798,8 @@ async fn fetch_document_by_filter() {

 #[actix_rt::test]
 async fn retrieve_vectors() {
-    let index = shared_empty_index().await;
+    let server = Server::new().await;
+    let index = server.index("doggo");

    // GET ALL DOCUMENTS BY QUERY
    let (response, _code) = index.get_all_documents_raw("?retrieveVectors=tamo").await;
--- a/meilisearch/tests/dumps/mod.rs
+++ b/meilisearch/tests/dumps/mod.rs
@@ -78,8 +78,7 @@ async fn import_dump_v1_movie_raw() {
      "pagination": {
        "maxTotalHits": 1000
      },
-      "searchCutoffMs": null,
-      "localizedAttributes": null
+      "searchCutoffMs": null
    }
    "###
    );
@@ -241,8 +240,7 @@ async fn import_dump_v1_movie_with_settings() {
      "pagination": {
        "maxTotalHits": 1000
      },
-      "searchCutoffMs": null,
-      "localizedAttributes": null
+      "searchCutoffMs": null
    }
    "###
    );
@@ -390,8 +388,7 @@ async fn import_dump_v1_rubygems_with_settings() {
      "pagination": {
        "maxTotalHits": 1000
      },
-      "searchCutoffMs": null,
-      "localizedAttributes": null
+      "searchCutoffMs": null
    }
    "###
    );
@@ -525,8 +522,7 @@ async fn import_dump_v2_movie_raw() {
      "pagination": {
        "maxTotalHits": 1000
      },
-      "searchCutoffMs": null,
-      "localizedAttributes": null
+      "searchCutoffMs": null
    }
    "###
    );
@@ -672,8 +668,7 @@ async fn import_dump_v2_movie_with_settings() {
      "pagination": {
        "maxTotalHits": 1000
      },
-      "searchCutoffMs": null,
-      "localizedAttributes": null
+      "searchCutoffMs": null
    }
    "###
    );
@@ -818,8 +813,7 @@ async fn import_dump_v2_rubygems_with_settings() {
      "pagination": {
        "maxTotalHits": 1000
      },
-      "searchCutoffMs": null,
-      "localizedAttributes": null
+      "searchCutoffMs": null
    }
    "###
    );
@@ -953,8 +947,7 @@ async fn import_dump_v3_movie_raw() {
      "pagination": {
        "maxTotalHits": 1000
      },
-      "searchCutoffMs": null,
-      "localizedAttributes": null
+      "searchCutoffMs": null
    }
    "###
    );
@@ -1100,8 +1093,7 @@ async fn import_dump_v3_movie_with_settings() {
      "pagination": {
        "maxTotalHits": 1000
      },
-      "searchCutoffMs": null,
-      "localizedAttributes": null
+      "searchCutoffMs": null
    }
    "###
    );
@@ -1246,8 +1238,7 @@ async fn import_dump_v3_rubygems_with_settings() {
      "pagination": {
        "maxTotalHits": 1000
      },
-      "searchCutoffMs": null,
-      "localizedAttributes": null
+      "searchCutoffMs": null
    }
    "###
    );
@@ -1381,8 +1372,7 @@ async fn import_dump_v4_movie_raw() {
      "pagination": {
        "maxTotalHits": 1000
      },
-      "searchCutoffMs": null,
-      "localizedAttributes": null
+      "searchCutoffMs": null
    }
    "###
    );
@@ -1528,8 +1518,7 @@ async fn import_dump_v4_movie_with_settings() {
      "pagination": {
        "maxTotalHits": 1000
      },
-      "searchCutoffMs": null,
-      "localizedAttributes": null
+      "searchCutoffMs": null
    }
    "###
    );
@@ -1674,8 +1663,7 @@ async fn import_dump_v4_rubygems_with_settings() {
      "pagination": {
        "maxTotalHits": 1000
      },
-      "searchCutoffMs": null,
-      "localizedAttributes": null
+      "searchCutoffMs": null
    }
    "###
    );
@@ -1921,8 +1909,7 @@ async fn import_dump_v6_containing_experimental_features() {
      "pagination": {
        "maxTotalHits": 1000
      },
-      "searchCutoffMs": null,
-      "localizedAttributes": null
+      "searchCutoffMs": null
    }
    "###);

@@ -2097,12 +2084,10 @@ async fn generate_and_import_dump_containing_vectors() {
          "source": "huggingFace",
          "model": "sentence-transformers/all-MiniLM-L6-v2",
          "revision": "e4ce9877abf3edfe10b0d82785e83bdcb973e22e",
-          "documentTemplate": "{{doc.doggo}}",
-          "documentTemplateMaxBytes": 400
+          "documentTemplate": "{{doc.doggo}}"
        }
      },
-      "searchCutoffMs": null,
-      "localizedAttributes": null
+      "searchCutoffMs": null
    }
    "###);

--- a/meilisearch/tests/dumps/snapshots/mod.rs/generate_and_import_dump_containing_vectors/1.snap
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/generate_and_import_dump_containing_vectors/1.snap
@@ -2,7 +2,7 @@
 source: meilisearch/tests/dumps/mod.rs
 ---
 {
-  "uid": "[uid]",
+  "uid": 0,
  "indexUid": "pets",
  "status": "succeeded",
  "type": "settingsUpdate",
--- a/meilisearch/tests/dumps/snapshots/mod.rs/generate_and_import_dump_containing_vectors/2.snap
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/generate_and_import_dump_containing_vectors/2.snap
@@ -2,7 +2,7 @@
 source: meilisearch/tests/dumps/mod.rs
 ---
 {
-  "uid": "[uid]",
+  "uid": 1,
  "indexUid": "pets",
  "status": "succeeded",
  "type": "documentAdditionOrUpdate",
--- a/meilisearch/tests/index/errors.rs
+++ b/meilisearch/tests/index/errors.rs
@@ -5,7 +5,7 @@ use crate::json;

 #[actix_rt::test]
 async fn get_indexes_bad_offset() {
-    let server = Server::new_shared();
+    let server = Server::new().await;

    let (response, code) = server.list_indexes_raw("?offset=doggo").await;
    snapshot!(code, @"400 Bad Request");
@@ -21,7 +21,7 @@ async fn get_indexes_bad_offset() {

 #[actix_rt::test]
 async fn get_indexes_bad_limit() {
-    let server = Server::new_shared();
+    let server = Server::new().await;

    let (response, code) = server.list_indexes_raw("?limit=doggo").await;
    snapshot!(code, @"400 Bad Request");
@@ -37,7 +37,7 @@ async fn get_indexes_bad_limit() {

 #[actix_rt::test]
 async fn get_indexes_unknown_field() {
-    let server = Server::new_shared();
+    let server = Server::new().await;

    let (response, code) = server.list_indexes_raw("?doggo=nolimit").await;
    snapshot!(code, @"400 Bad Request");
@@ -53,9 +53,9 @@ async fn get_indexes_unknown_field() {

 #[actix_rt::test]
 async fn create_index_missing_uid() {
-    let server = Server::new_shared();
+    let server = Server::new().await;

-    let (response, code) = server.create_index_fail(json!({ "primaryKey": "doggo" })).await;
+    let (response, code) = server.create_index(json!({ "primaryKey": "doggo" })).await;
    snapshot!(code, @"400 Bad Request");
    snapshot!(json_string!(response), @r###"
    {
@@ -69,9 +69,9 @@ async fn create_index_missing_uid() {

 #[actix_rt::test]
 async fn create_index_bad_uid() {
-    let server = Server::new_shared();
+    let server = Server::new().await;

-    let (response, code) = server.create_index_fail(json!({ "uid": "the best doggo" })).await;
+    let (response, code) = server.create_index(json!({ "uid": "the best doggo" })).await;
    snapshot!(code, @"400 Bad Request");
    snapshot!(json_string!(response), @r###"
    {
@@ -82,7 +82,7 @@ async fn create_index_bad_uid() {
    }
    "###);

-    let (response, code) = server.create_index_fail(json!({ "uid": true })).await;
+    let (response, code) = server.create_index(json!({ "uid": true })).await;
    snapshot!(code, @"400 Bad Request");
    snapshot!(json_string!(response), @r###"
    {
@@ -96,10 +96,10 @@ async fn create_index_bad_uid() {

 #[actix_rt::test]
 async fn create_index_bad_primary_key() {
-    let server = Server::new_shared();
+    let server = Server::new().await;

    let (response, code) = server
-        .create_index_fail(json!({ "uid": "doggo", "primaryKey": ["the", "best", "doggo"] }))
+        .create_index(json!({ "uid": "doggo", "primaryKey": ["the", "best", "doggo"] }))
        .await;
    snapshot!(code, @"400 Bad Request");
    snapshot!(json_string!(response), @r###"
@@ -114,10 +114,9 @@ async fn create_index_bad_primary_key() {

 #[actix_rt::test]
 async fn create_index_unknown_field() {
-    let server = Server::new_shared();
+    let server = Server::new().await;

-    let (response, code) =
-        server.create_index_fail(json!({ "uid": "doggo", "doggo": "bernese" })).await;
+    let (response, code) = server.create_index(json!({ "uid": "doggo", "doggo": "bernese" })).await;
    snapshot!(code, @"400 Bad Request");
    snapshot!(json_string!(response), @r###"
    {
@@ -131,8 +130,10 @@ async fn create_index_unknown_field() {

 #[actix_rt::test]
 async fn get_index_bad_uid() {
-    let server = Server::new_shared();
-    let (response, code) = server.get_index_fail("the good doggo").await;
+    let server = Server::new().await;
+    let index = server.index("the good doggo");
+
+    let (response, code) = index.get().await;
    snapshot!(code, @"400 Bad Request");
    snapshot!(json_string!(response), @r###"
    {
@@ -146,8 +147,9 @@ async fn get_index_bad_uid() {

 #[actix_rt::test]
 async fn update_index_bad_primary_key() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("doggo");
+
    let (response, code) = index.update_raw(json!({ "primaryKey": ["doggo"] })).await;
    snapshot!(code, @"400 Bad Request");
    snapshot!(json_string!(response), @r###"
@@ -162,8 +164,9 @@ async fn update_index_bad_primary_key() {

 #[actix_rt::test]
 async fn update_index_immutable_uid() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("doggo");
+
    let (response, code) = index.update_raw(json!({ "uid": "doggo" })).await;
    snapshot!(code, @"400 Bad Request");
    snapshot!(json_string!(response), @r###"
@@ -178,8 +181,9 @@ async fn update_index_immutable_uid() {

 #[actix_rt::test]
 async fn update_index_immutable_created_at() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("doggo");
+
    let (response, code) = index.update_raw(json!({ "createdAt": "doggo" })).await;
    snapshot!(code, @"400 Bad Request");
    snapshot!(json_string!(response), @r###"
@@ -194,8 +198,9 @@ async fn update_index_immutable_created_at() {

 #[actix_rt::test]
 async fn update_index_immutable_updated_at() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("doggo");
+
    let (response, code) = index.update_raw(json!({ "updatedAt": "doggo" })).await;
    snapshot!(code, @"400 Bad Request");
    snapshot!(json_string!(response), @r###"
@@ -210,8 +215,9 @@ async fn update_index_immutable_updated_at() {

 #[actix_rt::test]
 async fn update_index_unknown_field() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("doggo");
+
    let (response, code) = index.update_raw(json!({ "doggo": "bork" })).await;
    snapshot!(code, @"400 Bad Request");
    snapshot!(json_string!(response), @r###"
@@ -226,9 +232,10 @@ async fn update_index_unknown_field() {

 #[actix_rt::test]
 async fn update_index_bad_uid() {
-    let server = Server::new_shared();
-    let (response, code) =
-        server.update_raw_index_fail("the good doggo", json!({ "primaryKey": "doggo" })).await;
+    let server = Server::new().await;
+    let index = server.index("the good doggo");
+
+    let (response, code) = index.update_raw(json!({ "primaryKey": "doggo" })).await;
    snapshot!(code, @"400 Bad Request");
    snapshot!(json_string!(response), @r###"
    {
@@ -242,8 +249,10 @@ async fn update_index_bad_uid() {

 #[actix_rt::test]
 async fn delete_index_bad_uid() {
-    let server = Server::new_shared();
-    let (response, code) = server.delete_index_fail("the good doggo").await;
+    let server = Server::new().await;
+    let index = server.index("the good doggo");
+
+    let (response, code) = index.delete().await;
    snapshot!(code, @"400 Bad Request");
    snapshot!(json_string!(response), @r###"
    {
--- a/meilisearch/tests/logs/error.rs
+++ b/meilisearch/tests/logs/error.rs
@@ -5,7 +5,7 @@ use crate::json;

 #[actix_rt::test]
 async fn logs_stream_bad_target() {
-    let server = Server::new_shared();
+    let server = Server::new().await;

    // Wrong type
    let (response, code) = server.service.post("/logs/stream", json!({ "target": true })).await;
@@ -58,7 +58,7 @@ async fn logs_stream_bad_target() {

 #[actix_rt::test]
 async fn logs_stream_bad_mode() {
-    let server = Server::new_shared();
+    let server = Server::new().await;

    // Wrong type
    let (response, code) = server.service.post("/logs/stream", json!({ "mode": true })).await;
@@ -99,7 +99,7 @@ async fn logs_stream_bad_mode() {

 #[actix_rt::test]
 async fn logs_stream_bad_profile_memory() {
-    let server = Server::new_shared();
+    let server = Server::new().await;

    // Wrong type
    let (response, code) =
@@ -156,7 +156,7 @@ async fn logs_stream_bad_profile_memory() {

 #[actix_rt::test]
 async fn logs_stream_without_enabling_the_route() {
-    let server = Server::new_shared();
+    let server = Server::new().await;

    let (response, code) = server.service.post("/logs/stream", json!({})).await;
    snapshot!(code, @"400 Bad Request");
--- a/meilisearch/tests/logs/mod.rs
+++ b/meilisearch/tests/logs/mod.rs
@@ -1,13 +1,10 @@
 mod error;

-use std::num::NonZeroUsize;
 use std::rc::Rc;
 use std::str::FromStr;

 use actix_web::http::header::ContentType;
-use actix_web::web::Data;
 use meili_snap::snapshot;
-use meilisearch::search_queue::SearchQueue;
 use meilisearch::{analytics, create_app, Opt, SubscriberForSecondLayer};
 use tracing::level_filters::LevelFilter;
 use tracing_subscriber::layer::SubscriberExt;
@@ -43,15 +40,10 @@ async fn basic_test_log_stream_route() {
            .with_span_events(tracing_subscriber::fmt::format::FmtSpan::ACTIVE)
            .with_filter(tracing_subscriber::filter::LevelFilter::from_str("OFF").unwrap()),
    );
-    let search_queue = SearchQueue::new(
-        server.service.options.experimental_search_queue_size,
-        NonZeroUsize::new(1).unwrap(),
-    );

    let app = actix_web::test::init_service(create_app(
        server.service.index_scheduler.clone().into(),
        server.service.auth.clone().into(),
-        Data::new(search_queue),
        server.service.options.clone(),
        (route_layer_handle, stderr_layer_handle),
        analytics::MockAnalytics::new(&server.service.options),
--- a/meilisearch/tests/search/errors.rs
+++ b/meilisearch/tests/search/errors.rs
@@ -1,13 +1,16 @@
 use meili_snap::*;

-use crate::common::{shared_does_not_exists_index, Server};
+use super::DOCUMENTS;
+use crate::common::Server;
 use crate::json;

 #[actix_rt::test]
 async fn search_unexisting_index() {
-    let index = shared_does_not_exists_index().await;
+    let server = Server::new().await;
+    let index = server.index("test");
+
    let expected_response = json!({
-        "message": "Index `DOES_NOT_EXISTS` not found.",
+        "message": "Index `test` not found.",
        "code": "index_not_found",
        "type": "invalid_request",
        "link": "https://docs.meilisearch.com/errors#index_not_found"
@@ -23,8 +26,8 @@ async fn search_unexisting_index() {

 #[actix_rt::test]
 async fn search_unexisting_parameter() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");

    index
        .search(json!({"marin": "hello"}), |response, code| {
@@ -36,8 +39,8 @@ async fn search_unexisting_parameter() {

 #[actix_rt::test]
 async fn search_bad_q() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");

    let (response, code) = index.search_post(json!({"q": ["doggo"]})).await;
    snapshot!(code, @"400 Bad Request");
@@ -54,8 +57,8 @@ async fn search_bad_q() {

 #[actix_rt::test]
 async fn search_bad_offset() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");

    let (response, code) = index.search_post(json!({"offset": "doggo"})).await;
    snapshot!(code, @"400 Bad Request");
@@ -82,8 +85,8 @@ async fn search_bad_offset() {

 #[actix_rt::test]
 async fn search_bad_limit() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");

    let (response, code) = index.search_post(json!({"limit": "doggo"})).await;
    snapshot!(code, @"400 Bad Request");
@@ -110,8 +113,8 @@ async fn search_bad_limit() {

 #[actix_rt::test]
 async fn search_bad_page() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");

    let (response, code) = index.search_post(json!({"page": "doggo"})).await;
    snapshot!(code, @"400 Bad Request");
@@ -138,8 +141,8 @@ async fn search_bad_page() {

 #[actix_rt::test]
 async fn search_bad_hits_per_page() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");

    let (response, code) = index.search_post(json!({"hitsPerPage": "doggo"})).await;
    snapshot!(code, @"400 Bad Request");
@@ -166,8 +169,8 @@ async fn search_bad_hits_per_page() {

 #[actix_rt::test]
 async fn search_bad_attributes_to_retrieve() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");

    let (response, code) = index.search_post(json!({"attributesToRetrieve": "doggo"})).await;
    snapshot!(code, @"400 Bad Request");
@@ -184,8 +187,8 @@ async fn search_bad_attributes_to_retrieve() {

 #[actix_rt::test]
 async fn search_bad_retrieve_vectors() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");

    let (response, code) = index.search_post(json!({"retrieveVectors": "doggo"})).await;
    snapshot!(code, @"400 Bad Request");
@@ -234,8 +237,8 @@ async fn search_bad_retrieve_vectors() {

 #[actix_rt::test]
 async fn search_bad_attributes_to_crop() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");

    let (response, code) = index.search_post(json!({"attributesToCrop": "doggo"})).await;
    snapshot!(code, @"400 Bad Request");
@@ -252,8 +255,8 @@ async fn search_bad_attributes_to_crop() {

 #[actix_rt::test]
 async fn search_bad_crop_length() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");

    let (response, code) = index.search_post(json!({"cropLength": "doggo"})).await;
    snapshot!(code, @"400 Bad Request");
@@ -280,8 +283,8 @@ async fn search_bad_crop_length() {

 #[actix_rt::test]
 async fn search_bad_attributes_to_highlight() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");

    let (response, code) = index.search_post(json!({"attributesToHighlight": "doggo"})).await;
    snapshot!(code, @"400 Bad Request");
@@ -300,12 +303,14 @@ async fn search_bad_attributes_to_highlight() {
 async fn search_bad_filter() {
    // Since a filter is deserialized as a json Value it will never fail to deserialize.
    // Thus the error message is not generated by deserr but written by us.
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");
    // Also, to trigger the error message we need to effectively create the index or else it'll throw an
    // index does not exists error.
-    let (response, _code) = index.create(None).await;
-    server.wait_task(response.uid()).await.succeeded();
+    let (_, code) = index.create(None).await;
+    server.wait_task(0).await;
+
+    snapshot!(code, @"202 Accepted");

    let (response, code) = index.search_post(json!({ "filter": true })).await;
    snapshot!(code, @"400 Bad Request");
@@ -322,8 +327,8 @@ async fn search_bad_filter() {

 #[actix_rt::test]
 async fn search_bad_sort() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");

    let (response, code) = index.search_post(json!({"sort": "doggo"})).await;
    snapshot!(code, @"400 Bad Request");
@@ -340,8 +345,8 @@ async fn search_bad_sort() {

 #[actix_rt::test]
 async fn search_bad_show_matches_position() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");

    let (response, code) = index.search_post(json!({"showMatchesPosition": "doggo"})).await;
    snapshot!(code, @"400 Bad Request");
@@ -368,8 +373,8 @@ async fn search_bad_show_matches_position() {

 #[actix_rt::test]
 async fn search_bad_facets() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");

    let (response, code) = index.search_post(json!({"facets": "doggo"})).await;
    snapshot!(code, @"400 Bad Request");
@@ -386,8 +391,8 @@ async fn search_bad_facets() {

 #[actix_rt::test]
 async fn search_bad_threshold() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");

    let (response, code) = index.search_post(json!({"rankingScoreThreshold": "doggo"})).await;
    snapshot!(code, @"400 Bad Request");
@@ -403,8 +408,8 @@ async fn search_bad_threshold() {

 #[actix_rt::test]
 async fn search_invalid_threshold() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");

    let (response, code) = index.search_post(json!({"rankingScoreThreshold": 42})).await;
    snapshot!(code, @"400 Bad Request");
@@ -420,11 +425,11 @@ async fn search_invalid_threshold() {

 #[actix_rt::test]
 async fn search_non_filterable_facets() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
-    let (response, _code) = index.update_settings(json!({"filterableAttributes": ["title"]})).await;
+    let server = Server::new().await;
+    let index = server.index("test");
+    index.update_settings(json!({"filterableAttributes": ["title"]})).await;
    // Wait for the settings update to complete
-    index.wait_task(response.uid()).await.succeeded();
+    index.wait_task(0).await;

    let (response, code) = index.search_post(json!({"facets": ["doggo"]})).await;
    snapshot!(code, @"400 Bad Request");
@@ -451,11 +456,10 @@ async fn search_non_filterable_facets() {

 #[actix_rt::test]
 async fn search_non_filterable_facets_multiple_filterable() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
-    let (response, _code) =
-        index.update_settings(json!({"filterableAttributes": ["title", "genres"]})).await;
-    index.wait_task(response.uid()).await.succeeded();
+    let server = Server::new().await;
+    let index = server.index("test");
+    index.update_settings(json!({"filterableAttributes": ["title", "genres"]})).await;
+    index.wait_task(0).await;

    let (response, code) = index.search_post(json!({"facets": ["doggo"]})).await;
    snapshot!(code, @"400 Bad Request");
@@ -482,10 +486,10 @@ async fn search_non_filterable_facets_multiple_filterable() {

 #[actix_rt::test]
 async fn search_non_filterable_facets_no_filterable() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
-    let (response, _code) = index.update_settings(json!({"filterableAttributes": []})).await;
-    index.wait_task(response.uid()).await.succeeded();
+    let server = Server::new().await;
+    let index = server.index("test");
+    index.update_settings(json!({"filterableAttributes": []})).await;
+    index.wait_task(0).await;

    let (response, code) = index.search_post(json!({"facets": ["doggo"]})).await;
    snapshot!(code, @"400 Bad Request");
@@ -512,11 +516,10 @@ async fn search_non_filterable_facets_no_filterable() {

 #[actix_rt::test]
 async fn search_non_filterable_facets_multiple_facets() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
-    let (response, _uid) =
-        index.update_settings(json!({"filterableAttributes": ["title", "genres"]})).await;
-    index.wait_task(response.uid()).await.succeeded();
+    let server = Server::new().await;
+    let index = server.index("test");
+    index.update_settings(json!({"filterableAttributes": ["title", "genres"]})).await;
+    index.wait_task(0).await;

    let (response, code) = index.search_post(json!({"facets": ["doggo", "neko"]})).await;
    snapshot!(code, @"400 Bad Request");
@@ -543,8 +546,8 @@ async fn search_non_filterable_facets_multiple_facets() {

 #[actix_rt::test]
 async fn search_bad_highlight_pre_tag() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");

    let (response, code) = index.search_post(json!({"highlightPreTag": ["doggo"]})).await;
    snapshot!(code, @"400 Bad Request");
@@ -561,8 +564,8 @@ async fn search_bad_highlight_pre_tag() {

 #[actix_rt::test]
 async fn search_bad_highlight_post_tag() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");

    let (response, code) = index.search_post(json!({"highlightPostTag": ["doggo"]})).await;
    snapshot!(code, @"400 Bad Request");
@@ -579,8 +582,8 @@ async fn search_bad_highlight_post_tag() {

 #[actix_rt::test]
 async fn search_bad_crop_marker() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");

    let (response, code) = index.search_post(json!({"cropMarker": ["doggo"]})).await;
    snapshot!(code, @"400 Bad Request");
@@ -597,8 +600,8 @@ async fn search_bad_crop_marker() {

 #[actix_rt::test]
 async fn search_bad_matching_strategy() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");

    let (response, code) = index.search_post(json!({"matchingStrategy": "doggo"})).await;
    snapshot!(code, @"400 Bad Request");
@@ -636,17 +639,20 @@ async fn search_bad_matching_strategy() {

 #[actix_rt::test]
 async fn filter_invalid_syntax_object() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");

-    let (task, _code) = index.update_settings(json!({"filterableAttributes": ["title"]})).await;
+    index.update_settings(json!({"filterableAttributes": ["title"]})).await;
+
+    let documents = DOCUMENTS.clone();
+    let (task, _code) = index.add_documents(documents, None).await;
    index.wait_task(task.uid()).await;

    index
        .search(json!({"filter": "title & Glass"}), |response, code| {
            snapshot!(response, @r###"
            {
-              "message": "Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `IN`, `NOT IN`, `TO`, `EXISTS`, `NOT EXISTS`, `IS NULL`, `IS NOT NULL`, `IS EMPTY`, `IS NOT EMPTY`, `CONTAINS`, `NOT CONTAINS`, `STARTS WITH`, `NOT STARTS WITH`, `_geoRadius`, or `_geoBoundingBox` at `title & Glass`.\n1:14 title & Glass",
+              "message": "Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `IN`, `NOT IN`, `TO`, `EXISTS`, `NOT EXISTS`, `IS NULL`, `IS NOT NULL`, `IS EMPTY`, `IS NOT EMPTY`, `CONTAINS`, `NOT CONTAINS`, `_geoRadius`, or `_geoBoundingBox` at `title & Glass`.\n1:14 title & Glass",
              "code": "invalid_search_filter",
              "type": "invalid_request",
              "link": "https://docs.meilisearch.com/errors#invalid_search_filter"
@@ -659,17 +665,20 @@ async fn filter_invalid_syntax_object() {

 #[actix_rt::test]
 async fn filter_invalid_syntax_array() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");

-    let (task, _code) = index.update_settings(json!({"filterableAttributes": ["title"]})).await;
+    index.update_settings(json!({"filterableAttributes": ["title"]})).await;
+
+    let documents = DOCUMENTS.clone();
+    let (task, _code) = index.add_documents(documents, None).await;
    index.wait_task(task.uid()).await;

    index
        .search(json!({"filter": ["title & Glass"]}), |response, code| {
            snapshot!(response, @r###"
            {
-              "message": "Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `IN`, `NOT IN`, `TO`, `EXISTS`, `NOT EXISTS`, `IS NULL`, `IS NOT NULL`, `IS EMPTY`, `IS NOT EMPTY`, `CONTAINS`, `NOT CONTAINS`, `STARTS WITH`, `NOT STARTS WITH`, `_geoRadius`, or `_geoBoundingBox` at `title & Glass`.\n1:14 title & Glass",
+              "message": "Was expecting an operation `=`, `!=`, `>=`, `>`, `<=`, `<`, `IN`, `NOT IN`, `TO`, `EXISTS`, `NOT EXISTS`, `IS NULL`, `IS NOT NULL`, `IS EMPTY`, `IS NOT EMPTY`, `CONTAINS`, `NOT CONTAINS`, `_geoRadius`, or `_geoBoundingBox` at `title & Glass`.\n1:14 title & Glass",
              "code": "invalid_search_filter",
              "type": "invalid_request",
              "link": "https://docs.meilisearch.com/errors#invalid_search_filter"
@@ -682,11 +691,14 @@ async fn filter_invalid_syntax_array() {

 #[actix_rt::test]
 async fn filter_invalid_syntax_string() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");

-    let (task, _code) = index.update_settings(json!({"filterableAttributes": ["title"]})).await;
-    index.wait_task(task.uid()).await;
+    index.update_settings(json!({"filterableAttributes": ["title"]})).await;
+
+    let documents = DOCUMENTS.clone();
+    index.add_documents(documents, None).await;
+    index.wait_task(1).await;

    let expected_response = json!({
        "message": "Found unexpected characters at the end of the filter: `XOR title = Glass`. You probably forgot an `OR` or an `AND` rule.\n15:32 title = Glass XOR title = Glass",
@@ -704,11 +716,14 @@ async fn filter_invalid_syntax_string() {

 #[actix_rt::test]
 async fn filter_invalid_attribute_array() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");

-    let (task, _code) = index.update_settings(json!({"filterableAttributes": ["title"]})).await;
-    index.wait_task(task.uid()).await;
+    index.update_settings(json!({"filterableAttributes": ["title"]})).await;
+
+    let documents = DOCUMENTS.clone();
+    index.add_documents(documents, None).await;
+    index.wait_task(1).await;

    let expected_response = json!({
        "message": "Attribute `many` is not filterable. Available filterable attributes are: `title`.\n1:5 many = Glass",
@@ -726,11 +741,14 @@ async fn filter_invalid_attribute_array() {

 #[actix_rt::test]
 async fn filter_invalid_attribute_string() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");

-    let (task, _code) = index.update_settings(json!({"filterableAttributes": ["title"]})).await;
-    index.wait_task(task.uid()).await;
+    index.update_settings(json!({"filterableAttributes": ["title"]})).await;
+
+    let documents = DOCUMENTS.clone();
+    index.add_documents(documents, None).await;
+    index.wait_task(1).await;

    let expected_response = json!({
        "message": "Attribute `many` is not filterable. Available filterable attributes are: `title`.\n1:5 many = Glass",
@@ -748,11 +766,14 @@ async fn filter_invalid_attribute_string() {

 #[actix_rt::test]
 async fn filter_reserved_geo_attribute_array() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");

-    let (task, _code) = index.update_settings(json!({"filterableAttributes": ["title"]})).await;
-    index.wait_task(task.uid()).await;
+    index.update_settings(json!({"filterableAttributes": ["title"]})).await;
+
+    let documents = DOCUMENTS.clone();
+    index.add_documents(documents, None).await;
+    index.wait_task(1).await;

    let expected_response = json!({
        "message": "`_geo` is a reserved keyword and thus can't be used as a filter expression. Use the `_geoRadius(latitude, longitude, distance)` or `_geoBoundingBox([latitude, longitude], [latitude, longitude])` built-in rules to filter on `_geo` coordinates.\n1:13 _geo = Glass",
@@ -770,11 +791,14 @@ async fn filter_reserved_geo_attribute_array() {

 #[actix_rt::test]
 async fn filter_reserved_geo_attribute_string() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");

-    let (task, _code) = index.update_settings(json!({"filterableAttributes": ["title"]})).await;
-    index.wait_task(task.uid()).await;
+    index.update_settings(json!({"filterableAttributes": ["title"]})).await;
+
+    let documents = DOCUMENTS.clone();
+    index.add_documents(documents, None).await;
+    index.wait_task(1).await;

    let expected_response = json!({
        "message": "`_geo` is a reserved keyword and thus can't be used as a filter expression. Use the `_geoRadius(latitude, longitude, distance)` or `_geoBoundingBox([latitude, longitude], [latitude, longitude])` built-in rules to filter on `_geo` coordinates.\n1:13 _geo = Glass",
@@ -792,11 +816,14 @@ async fn filter_reserved_geo_attribute_string() {

 #[actix_rt::test]
 async fn filter_reserved_attribute_array() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");

-    let (task, _code) = index.update_settings(json!({"filterableAttributes": ["title"]})).await;
-    index.wait_task(task.uid()).await;
+    index.update_settings(json!({"filterableAttributes": ["title"]})).await;
+
+    let documents = DOCUMENTS.clone();
+    index.add_documents(documents, None).await;
+    index.wait_task(1).await;

    let expected_response = json!({
        "message": "`_geoDistance` is a reserved keyword and thus can't be used as a filter expression. Use the `_geoRadius(latitude, longitude, distance)` or `_geoBoundingBox([latitude, longitude], [latitude, longitude])` built-in rules to filter on `_geo` coordinates.\n1:21 _geoDistance = Glass",
@@ -814,11 +841,14 @@ async fn filter_reserved_attribute_array() {

 #[actix_rt::test]
 async fn filter_reserved_attribute_string() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");

-    let (task, _code) = index.update_settings(json!({"filterableAttributes": ["title"]})).await;
-    index.wait_task(task.uid()).await;
+    index.update_settings(json!({"filterableAttributes": ["title"]})).await;
+
+    let documents = DOCUMENTS.clone();
+    index.add_documents(documents, None).await;
+    index.wait_task(1).await;

    let expected_response = json!({
       "message": "`_geoDistance` is a reserved keyword and thus can't be used as a filter expression. Use the `_geoRadius(latitude, longitude, distance)` or `_geoBoundingBox([latitude, longitude], [latitude, longitude])` built-in rules to filter on `_geo` coordinates.\n1:21 _geoDistance = Glass",
@@ -836,11 +866,14 @@ async fn filter_reserved_attribute_string() {

 #[actix_rt::test]
 async fn filter_reserved_geo_point_array() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");

-    let (task, _code) = index.update_settings(json!({"filterableAttributes": ["title"]})).await;
-    index.wait_task(task.uid()).await;
+    index.update_settings(json!({"filterableAttributes": ["title"]})).await;
+
+    let documents = DOCUMENTS.clone();
+    index.add_documents(documents, None).await;
+    index.wait_task(1).await;

    let expected_response = json!({
        "message": "`_geoPoint` is a reserved keyword and thus can't be used as a filter expression. Use the `_geoRadius(latitude, longitude, distance)` or `_geoBoundingBox([latitude, longitude], [latitude, longitude])` built-in rules to filter on `_geo` coordinates.\n1:18 _geoPoint = Glass",
@@ -858,11 +891,14 @@ async fn filter_reserved_geo_point_array() {

 #[actix_rt::test]
 async fn filter_reserved_geo_point_string() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");

-    let (task, _code) = index.update_settings(json!({"filterableAttributes": ["title"]})).await;
-    index.wait_task(task.uid()).await;
+    index.update_settings(json!({"filterableAttributes": ["title"]})).await;
+
+    let documents = DOCUMENTS.clone();
+    index.add_documents(documents, None).await;
+    index.wait_task(1).await;

    let expected_response = json!({
       "message": "`_geoPoint` is a reserved keyword and thus can't be used as a filter expression. Use the `_geoRadius(latitude, longitude, distance)` or `_geoBoundingBox([latitude, longitude], [latitude, longitude])` built-in rules to filter on `_geo` coordinates.\n1:18 _geoPoint = Glass",
@@ -880,11 +916,14 @@ async fn filter_reserved_geo_point_string() {

 #[actix_rt::test]
 async fn sort_geo_reserved_attribute() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");

-    let (task, _code) = index.update_settings(json!({"sortableAttributes": ["id"]})).await;
-    index.wait_task(task.uid()).await;
+    index.update_settings(json!({"sortableAttributes": ["id"]})).await;
+
+    let documents = DOCUMENTS.clone();
+    index.add_documents(documents, None).await;
+    index.wait_task(1).await;

    let expected_response = json!({
        "message": "`_geo` is a reserved keyword and thus can't be used as a sort expression. Use the _geoPoint(latitude, longitude) built-in rule to sort on _geo field coordinates.",
@@ -907,11 +946,14 @@ async fn sort_geo_reserved_attribute() {

 #[actix_rt::test]
 async fn sort_reserved_attribute() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");

-    let (task, _code) = index.update_settings(json!({"sortableAttributes": ["id"]})).await;
-    index.wait_task(task.uid()).await;
+    index.update_settings(json!({"sortableAttributes": ["id"]})).await;
+
+    let documents = DOCUMENTS.clone();
+    index.add_documents(documents, None).await;
+    index.wait_task(1).await;

    let expected_response = json!({
        "message": "`_geoDistance` is a reserved keyword and thus can't be used as a sort expression.",
@@ -934,10 +976,14 @@ async fn sort_reserved_attribute() {

 #[actix_rt::test]
 async fn sort_unsortable_attribute() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
-    let (response, _code) = index.update_settings(json!({"sortableAttributes": ["id"]})).await;
-    index.wait_task(response.uid()).await.succeeded();
+    let server = Server::new().await;
+    let index = server.index("test");
+
+    index.update_settings(json!({"sortableAttributes": ["id"]})).await;
+
+    let documents = DOCUMENTS.clone();
+    index.add_documents(documents, None).await;
+    index.wait_task(1).await;

    let expected_response = json!({
        "message": "Attribute `title` is not sortable. Available sortable attributes are: `id`.",
@@ -960,11 +1006,14 @@ async fn sort_unsortable_attribute() {

 #[actix_rt::test]
 async fn sort_invalid_syntax() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");

-    let (response, _code) = index.update_settings(json!({"sortableAttributes": ["id"]})).await;
-    index.wait_task(response.uid()).await.succeeded();
+    index.update_settings(json!({"sortableAttributes": ["id"]})).await;
+
+    let documents = DOCUMENTS.clone();
+    index.add_documents(documents, None).await;
+    index.wait_task(1).await;

    let expected_response = json!({
        "message": "Invalid syntax for the sort parameter: expected expression ending by `:asc` or `:desc`, found `title`.",
@@ -987,15 +1036,18 @@ async fn sort_invalid_syntax() {

 #[actix_rt::test]
 async fn sort_unset_ranking_rule() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("test");

-    let (response, _code) = index
+    index
        .update_settings(
            json!({"sortableAttributes": ["title"], "rankingRules": ["proximity", "exactness"]}),
        )
        .await;
-    index.wait_task(response.uid()).await.succeeded();
+
+    let documents = DOCUMENTS.clone();
+    index.add_documents(documents, None).await;
+    index.wait_task(1).await;

    let expected_response = json!({
        "message": "You must specify where `sort` is listed in the rankingRules setting to use the sort parameter at search time.",
@@ -1018,11 +1070,14 @@ async fn sort_unset_ranking_rule() {

 #[actix_rt::test]
 async fn search_on_unknown_field() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
-    let (response, _code) =
-        index.update_settings_searchable_attributes(json!(["id", "title"])).await;
-    index.wait_task(response.uid()).await.succeeded();
+    let server = Server::new().await;
+    let index = server.index("test");
+    index.update_settings_searchable_attributes(json!(["id", "title"])).await;
+    index.wait_task(0).await;
+
+    let documents = DOCUMENTS.clone();
+    index.add_documents(documents, None).await;
+    index.wait_task(1).await;

    index
        .search(
@@ -1044,11 +1099,14 @@ async fn search_on_unknown_field() {

 #[actix_rt::test]
 async fn search_on_unknown_field_plus_joker() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
-    let (response, _code) =
-        index.update_settings_searchable_attributes(json!(["id", "title"])).await;
-    index.wait_task(response.uid()).await.succeeded();
+    let server = Server::new().await;
+    let index = server.index("test");
+    index.update_settings_searchable_attributes(json!(["id", "title"])).await;
+    index.wait_task(0).await;
+
+    let documents = DOCUMENTS.clone();
+    index.add_documents(documents, None).await;
+    index.wait_task(1).await;

    index
        .search(
@@ -1087,10 +1145,11 @@ async fn search_on_unknown_field_plus_joker() {

 #[actix_rt::test]
 async fn distinct_at_search_time() {
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("tamo");
    let (task, _) = index.create(None).await;
-    index.wait_task(task.uid()).await.succeeded();
+    let task = index.wait_task(task.uid()).await;
+    snapshot!(task, name: "task-succeed");

    let (response, code) =
        index.search_post(json!({"page": 0, "hitsPerPage": 2, "distinct": "doggo.truc"})).await;
@@ -1151,8 +1210,8 @@ async fn distinct_at_search_time() {
 async fn search_with_contains_without_enabling_the_feature() {
    // Since a filter is deserialized as a json Value it will never fail to deserialize.
    // Thus the error message is not generated by deserr but written by us.
-    let server = Server::new_shared();
-    let index = server.unique_index();
+    let server = Server::new().await;
+    let index = server.index("doggo");
    // Also, to trigger the error message we need to effectively create the index or else it'll throw an
    // index does not exists error.
    let (task, _code) = index.create(None).await;
@@ -1163,7 +1222,7 @@ async fn search_with_contains_without_enabling_the_feature() {
            snapshot!(code, @"400 Bad Request");
            snapshot!(json_string!(response), @r###"
            {
-              "message": "Using `CONTAINS` or `STARTS WITH` in a filter requires enabling the `contains filter` experimental feature. See https://github.com/orgs/meilisearch/discussions/763\n7:15 doggo CONTAINS kefir",
+              "message": "Using `CONTAINS` in a filter requires enabling the `contains filter` experimental feature. See https://github.com/orgs/meilisearch/discussions/763\n7:15 doggo CONTAINS kefir",
              "code": "feature_not_enabled",
              "type": "invalid_request",
              "link": "https://docs.meilisearch.com/errors#feature_not_enabled"
@@ -1176,7 +1235,7 @@ async fn search_with_contains_without_enabling_the_feature() {
            snapshot!(code, @"400 Bad Request");
            snapshot!(json_string!(response), @r###"
            {
-              "message": "Using `CONTAINS` or `STARTS WITH` in a filter requires enabling the `contains filter` experimental feature. See https://github.com/orgs/meilisearch/discussions/763\n25:33 doggo != echo AND doggo CONTAINS kefir",
+              "message": "Using `CONTAINS` in a filter requires enabling the `contains filter` experimental feature. See https://github.com/orgs/meilisearch/discussions/763\n25:33 doggo != echo AND doggo CONTAINS kefir",
              "code": "feature_not_enabled",
              "type": "invalid_request",
              "link": "https://docs.meilisearch.com/errors#feature_not_enabled"
@@ -1192,7 +1251,7 @@ async fn search_with_contains_without_enabling_the_feature() {
    snapshot!(code, @"400 Bad Request");
    snapshot!(json_string!(response), @r###"
    {
-      "message": "Using `CONTAINS` or `STARTS WITH` in a filter requires enabling the `contains filter` experimental feature. See https://github.com/orgs/meilisearch/discussions/763\n7:15 doggo CONTAINS kefir",
+      "message": "Using `CONTAINS` in a filter requires enabling the `contains filter` experimental feature. See https://github.com/orgs/meilisearch/discussions/763\n7:15 doggo CONTAINS kefir",
      "code": "feature_not_enabled",
      "type": "invalid_request",
      "link": "https://docs.meilisearch.com/errors#feature_not_enabled"
@@ -1204,7 +1263,7 @@ async fn search_with_contains_without_enabling_the_feature() {
    snapshot!(code, @"400 Bad Request");
    snapshot!(json_string!(response), @r###"
    {
-      "message": "Using `CONTAINS` or `STARTS WITH` in a filter requires enabling the `contains filter` experimental feature. See https://github.com/orgs/meilisearch/discussions/763\n7:15 doggo CONTAINS kefir",
+      "message": "Using `CONTAINS` in a filter requires enabling the `contains filter` experimental feature. See https://github.com/orgs/meilisearch/discussions/763\n7:15 doggo CONTAINS kefir",
      "code": "feature_not_enabled",
      "type": "invalid_request",
      "link": "https://docs.meilisearch.com/errors#feature_not_enabled"
--- a/meilisearch/tests/search/hybrid.rs
+++ b/meilisearch/tests/search/hybrid.rs
@@ -128,7 +128,7 @@ async fn simple_search() {

    let (response, code) = index
        .search_post(
-            json!({"q": "Captain", "vector": [1.0, 1.0], "hybrid": {"semanticRatio": 0.2, "embedder": "default"}, "retrieveVectors": true}),
+            json!({"q": "Captain", "vector": [1.0, 1.0], "hybrid": {"semanticRatio": 0.2}, "retrieveVectors": true}),
        )
        .await;
    snapshot!(code, @"200 OK");
@@ -137,7 +137,7 @@ async fn simple_search() {

    let (response, code) = index
        .search_post(
-            json!({"q": "Captain", "vector": [1.0, 1.0], "hybrid": {"semanticRatio": 0.5, "embedder": "default"}, "showRankingScore": true, "retrieveVectors": true}),
+            json!({"q": "Captain", "vector": [1.0, 1.0], "hybrid": {"semanticRatio": 0.5}, "showRankingScore": true, "retrieveVectors": true}),
        )
        .await;
    snapshot!(code, @"200 OK");
@@ -146,7 +146,7 @@ async fn simple_search() {

    let (response, code) = index
        .search_post(
-            json!({"q": "Captain", "vector": [1.0, 1.0], "hybrid": {"semanticRatio": 0.8, "embedder": "default"}, "showRankingScore": true, "retrieveVectors": true}),
+            json!({"q": "Captain", "vector": [1.0, 1.0], "hybrid": {"semanticRatio": 0.8}, "showRankingScore": true, "retrieveVectors": true}),
        )
        .await;
    snapshot!(code, @"200 OK");
@@ -161,7 +161,7 @@ async fn limit_offset() {

    let (response, code) = index
        .search_post(
-            json!({"q": "Captain", "vector": [1.0, 1.0], "hybrid": {"semanticRatio": 0.2, "embedder": "default"}, "retrieveVectors": true, "offset": 1, "limit": 1}),
+            json!({"q": "Captain", "vector": [1.0, 1.0], "hybrid": {"semanticRatio": 0.2}, "retrieveVectors": true, "offset": 1, "limit": 1}),
        )
        .await;
    snapshot!(code, @"200 OK");
@@ -174,7 +174,7 @@ async fn limit_offset() {

    let (response, code) = index
        .search_post(
-            json!({"q": "Captain", "vector": [1.0, 1.0], "hybrid": {"semanticRatio": 0.9, "embedder": "default"}, "retrieveVectors": true, "offset": 1, "limit": 1}),
+            json!({"q": "Captain", "vector": [1.0, 1.0], "hybrid": {"semanticRatio": 0.9}, "retrieveVectors": true, "offset": 1, "limit": 1}),
        )
        .await;
    snapshot!(code, @"200 OK");
@@ -188,11 +188,8 @@ async fn simple_search_hf() {
    let server = Server::new().await;
    let index = index_with_documents_hf(&server, &SIMPLE_SEARCH_DOCUMENTS).await;

-    let (response, code) = index
-        .search_post(
-            json!({"q": "Captain", "hybrid": {"semanticRatio": 0.2, "embedder": "default"}}),
-        )
-        .await;
+    let (response, code) =
+        index.search_post(json!({"q": "Captain", "hybrid": {"semanticRatio": 0.2}})).await;
    snapshot!(code, @"200 OK");
    snapshot!(response["hits"], @r###"[{"title":"Captain Planet","desc":"He's not part of the Marvel Cinematic Universe","id":"2"},{"title":"Captain Marvel","desc":"a Shazam ersatz","id":"3"},{"title":"Shazam!","desc":"a Captain Marvel ersatz","id":"1"}]"###);
    snapshot!(response["semanticHitCount"], @"0");
@@ -200,7 +197,7 @@ async fn simple_search_hf() {
    let (response, code) = index
        .search_post(
            // disable ranking score as the vectors between architectures are not equal
-            json!({"q": "Captain", "hybrid": {"embedder": "default", "semanticRatio": 0.55}, "showRankingScore": false}),
+            json!({"q": "Captain", "hybrid": {"semanticRatio": 0.55}, "showRankingScore": false}),
        )
        .await;
    snapshot!(code, @"200 OK");
@@ -209,7 +206,7 @@ async fn simple_search_hf() {

    let (response, code) = index
        .search_post(
-            json!({"q": "Captain", "hybrid": {"embedder": "default", "semanticRatio": 0.8}, "showRankingScore": false}),
+            json!({"q": "Captain", "hybrid": {"semanticRatio": 0.8}, "showRankingScore": false}),
        )
        .await;
    snapshot!(code, @"200 OK");
@@ -218,7 +215,7 @@ async fn simple_search_hf() {

    let (response, code) = index
        .search_post(
-            json!({"q": "Movie World", "hybrid": {"embedder": "default", "semanticRatio": 0.2}, "showRankingScore": false}),
+            json!({"q": "Movie World", "hybrid": {"semanticRatio": 0.2}, "showRankingScore": false}),
        )
        .await;
    snapshot!(code, @"200 OK");
@@ -227,7 +224,7 @@ async fn simple_search_hf() {

    let (response, code) = index
        .search_post(
-            json!({"q": "Wonder replacement", "hybrid": {"embedder": "default", "semanticRatio": 0.2}, "showRankingScore": false}),
+            json!({"q": "Wonder replacement", "hybrid": {"semanticRatio": 0.2}, "showRankingScore": false}),
        )
        .await;
    snapshot!(code, @"200 OK");
@@ -240,7 +237,7 @@ async fn distribution_shift() {
    let server = Server::new().await;
    let index = index_with_documents_user_provided(&server, &SIMPLE_SEARCH_DOCUMENTS_VEC).await;

-    let search = json!({"q": "Captain", "vector": [1.0, 1.0], "showRankingScore": true, "hybrid": {"embedder": "default", "semanticRatio": 1.0}, "retrieveVectors": true});
+    let search = json!({"q": "Captain", "vector": [1.0, 1.0], "showRankingScore": true, "hybrid": {"semanticRatio": 1.0}, "retrieveVectors": true});
    let (response, code) = index.search_post(search.clone()).await;
    snapshot!(code, @"200 OK");
    snapshot!(response["hits"], @r###"[{"title":"Captain Marvel","desc":"a Shazam ersatz","id":"3","_vectors":{"default":{"embeddings":[[2.0,3.0]],"regenerate":false}},"_rankingScore":0.990290343761444},{"title":"Captain Planet","desc":"He's not part of the Marvel Cinematic Universe","id":"2","_vectors":{"default":{"embeddings":[[1.0,2.0]],"regenerate":false}},"_rankingScore":0.974341630935669},{"title":"Shazam!","desc":"a Captain Marvel ersatz","id":"1","_vectors":{"default":{"embeddings":[[1.0,3.0]],"regenerate":false}},"_rankingScore":0.9472135901451112}]"###);
@@ -274,7 +271,7 @@ async fn highlighter() {

    let (response, code) = index
        .search_post(json!({"q": "Captain Marvel", "vector": [1.0, 1.0],
-            "hybrid": {"embedder": "default", "semanticRatio": 0.2},
+            "hybrid": {"semanticRatio": 0.2},
           "retrieveVectors": true,
           "attributesToHighlight": [
                     "desc",
@@ -290,7 +287,7 @@ async fn highlighter() {

    let (response, code) = index
        .search_post(json!({"q": "Captain Marvel", "vector": [1.0, 1.0],
-            "hybrid": {"embedder": "default", "semanticRatio": 0.8},
+            "hybrid": {"semanticRatio": 0.8},
            "retrieveVectors": true,
            "showRankingScore": true,
            "attributesToHighlight": [
@@ -307,7 +304,7 @@ async fn highlighter() {
    // no highlighting on full semantic
    let (response, code) = index
        .search_post(json!({"q": "Captain Marvel", "vector": [1.0, 1.0],
-            "hybrid": {"embedder": "default", "semanticRatio": 1.0},
+            "hybrid": {"semanticRatio": 1.0},
            "retrieveVectors": true,
            "showRankingScore": true,
            "attributesToHighlight": [
@@ -329,7 +326,7 @@ async fn invalid_semantic_ratio() {

    let (response, code) = index
        .search_post(
-            json!({"q": "Captain", "vector": [1.0, 1.0], "hybrid": {"embedder": "default", "semanticRatio": 1.2}}),
+            json!({"q": "Captain", "vector": [1.0, 1.0], "hybrid": {"semanticRatio": 1.2}}),
        )
        .await;
    snapshot!(code, @"400 Bad Request");
@@ -344,7 +341,7 @@ async fn invalid_semantic_ratio() {

    let (response, code) = index
        .search_post(
-            json!({"q": "Captain", "vector": [1.0, 1.0], "hybrid": {"embedder": "default", "semanticRatio": -0.8}}),
+            json!({"q": "Captain", "vector": [1.0, 1.0], "hybrid": {"semanticRatio": -0.8}}),
        )
        .await;
    snapshot!(code, @"400 Bad Request");
@@ -360,7 +357,7 @@ async fn invalid_semantic_ratio() {
    let (response, code) = index
        .search_get(
            &yaup::to_string(
-                &json!({"q": "Captain", "vector": [1.0, 1.0], "hybridEmbedder": "default", "hybridSemanticRatio": 1.2}),
+                &json!({"q": "Captain", "vector": [1.0, 1.0], "hybridSemanticRatio": 1.2}),
            )
            .unwrap(),
        )
@@ -378,7 +375,7 @@ async fn invalid_semantic_ratio() {
    let (response, code) = index
        .search_get(
            &yaup::to_string(
-                &json!({"q": "Captain", "vector": [1.0, 1.0], "hybridEmbedder": "default", "hybridSemanticRatio": -0.2}),
+                &json!({"q": "Captain", "vector": [1.0, 1.0], "hybridSemanticRatio": -0.2}),
            )
            .unwrap(),
        )
@@ -401,7 +398,7 @@ async fn single_document() {

    let (response, code) = index
    .search_post(
-        json!({"vector": [1.0, 3.0], "hybrid": {"semanticRatio": 1.0, "embedder": "default"}, "showRankingScore": true, "retrieveVectors": true}),
+        json!({"vector": [1.0, 3.0], "hybrid": {"semanticRatio": 1.0}, "showRankingScore": true, "retrieveVectors": true}),
    )
    .await;

@@ -417,7 +414,7 @@ async fn query_combination() {

    // search without query and vector, but with hybrid => still placeholder
    let (response, code) = index
-        .search_post(json!({"hybrid": {"embedder": "default", "semanticRatio": 1.0}, "showRankingScore": true, "retrieveVectors": true}))
+        .search_post(json!({"hybrid": {"semanticRatio": 1.0}, "showRankingScore": true, "retrieveVectors": true}))
        .await;

    snapshot!(code, @"200 OK");
@@ -426,7 +423,7 @@ async fn query_combination() {

    // same with a different semantic ratio
    let (response, code) = index
-        .search_post(json!({"hybrid": {"embedder": "default", "semanticRatio": 0.76}, "showRankingScore": true, "retrieveVectors": true}))
+        .search_post(json!({"hybrid": {"semanticRatio": 0.76}, "showRankingScore": true, "retrieveVectors": true}))
        .await;

    snapshot!(code, @"200 OK");
@@ -435,7 +432,7 @@ async fn query_combination() {

    // wrong vector dimensions
    let (response, code) = index
-    .search_post(json!({"vector": [1.0, 0.0, 1.0], "hybrid": {"embedder": "default", "semanticRatio": 1.0}, "showRankingScore": true, "retrieveVectors": true}))
+    .search_post(json!({"vector": [1.0, 0.0, 1.0], "hybrid": {"semanticRatio": 1.0}, "showRankingScore": true, "retrieveVectors": true}))
    .await;

    snapshot!(code, @"400 Bad Request");
@@ -450,7 +447,7 @@ async fn query_combination() {

    // full vector
    let (response, code) = index
-    .search_post(json!({"vector": [1.0, 0.0], "hybrid": {"embedder": "default", "semanticRatio": 1.0}, "showRankingScore": true, "retrieveVectors": true}))
+    .search_post(json!({"vector": [1.0, 0.0], "hybrid": {"semanticRatio": 1.0}, "showRankingScore": true, "retrieveVectors": true}))
    .await;

    snapshot!(code, @"200 OK");
@@ -459,7 +456,7 @@ async fn query_combination() {

    // full keyword, without a query
    let (response, code) = index
-    .search_post(json!({"vector": [1.0, 0.0], "hybrid": {"embedder": "default", "semanticRatio": 0.0}, "showRankingScore": true, "retrieveVectors": true}))
+    .search_post(json!({"vector": [1.0, 0.0], "hybrid": {"semanticRatio": 0.0}, "showRankingScore": true, "retrieveVectors": true}))
    .await;

    snapshot!(code, @"200 OK");
@@ -468,7 +465,7 @@ async fn query_combination() {

    // query + vector, full keyword => keyword
    let (response, code) = index
-    .search_post(json!({"q": "Captain", "vector": [1.0, 0.0], "hybrid": {"embedder": "default", "semanticRatio": 0.0}, "showRankingScore": true, "retrieveVectors": true}))
+    .search_post(json!({"q": "Captain", "vector": [1.0, 0.0], "hybrid": {"semanticRatio": 0.0}, "showRankingScore": true, "retrieveVectors": true}))
    .await;

    snapshot!(code, @"200 OK");
@@ -483,7 +480,7 @@ async fn query_combination() {
    snapshot!(code, @"400 Bad Request");
    snapshot!(response, @r###"
    {
-      "message": "Invalid request: missing `hybrid` parameter when `vector` is present.",
+      "message": "Invalid request: missing `hybrid` parameter when both `q` and `vector` are present.",
      "code": "missing_search_hybrid",
      "type": "invalid_request",
      "link": "https://docs.meilisearch.com/errors#missing_search_hybrid"
@@ -493,14 +490,14 @@ async fn query_combination() {
    // full vector, without a vector => error
    let (response, code) = index
        .search_post(
-            json!({"q": "Captain", "hybrid": {"semanticRatio": 1.0, "embedder": "default"}, "showRankingScore": true, "retrieveVectors": true}),
+            json!({"q": "Captain", "hybrid": {"semanticRatio": 1.0}, "showRankingScore": true, "retrieveVectors": true}),
        )
        .await;

    snapshot!(code, @"400 Bad Request");
    snapshot!(response, @r###"
    {
-      "message": "Error while generating embeddings: user error: attempt to embed the following text in a configuration where embeddings must be user provided:\n  - `Captain`",
+      "message": "Error while generating embeddings: user error: attempt to embed the following text in a configuration where embeddings must be user provided: \"Captain\"",
      "code": "vector_embedding_error",
      "type": "invalid_request",
      "link": "https://docs.meilisearch.com/errors#vector_embedding_error"
@@ -510,7 +507,7 @@ async fn query_combination() {
    // hybrid without a vector => full keyword
    let (response, code) = index
        .search_post(
-            json!({"q": "Planet", "hybrid": {"semanticRatio": 0.99, "embedder": "default"}, "showRankingScore": true, "retrieveVectors": true}),
+            json!({"q": "Planet", "hybrid": {"semanticRatio": 0.99}, "showRankingScore": true, "retrieveVectors": true}),
        )
        .await;

@@ -526,7 +523,7 @@ async fn retrieve_vectors() {

    let (response, code) = index
        .search_post(
-            json!({"q": "Captain", "hybrid": {"embedder": "default", "semanticRatio": 0.2}, "retrieveVectors": true}),
+            json!({"q": "Captain", "hybrid": {"semanticRatio": 0.2}, "retrieveVectors": true}),
        )
        .await;
    snapshot!(code, @"200 OK");
@@ -576,7 +573,7 @@ async fn retrieve_vectors() {

    let (response, code) = index
        .search_post(
-            json!({"q": "Captain", "hybrid": {"embedder": "default", "semanticRatio": 0.2}, "retrieveVectors": true}),
+            json!({"q": "Captain", "hybrid": {"semanticRatio": 0.2}, "retrieveVectors": true}),
        )
        .await;
    snapshot!(code, @"200 OK");
--- a/meilisearch/tests/search/locales.rs
+++ b/meilisearch/tests/search/locales.rs
--- a/meilisearch/tests/search/mod.rs
+++ b/meilisearch/tests/search/mod.rs
@@ -7,8 +7,6 @@ mod facet_search;
 mod formatted;
 mod geo;
 mod hybrid;
-#[cfg(not(feature = "chinese-pinyin"))]
-mod locales;
 mod matching_strategy;
 mod multi;
 mod pagination;
@@ -16,17 +14,208 @@ mod restrict_searchable;
 mod search_queue;

 use meilisearch::Opt;
+use once_cell::sync::Lazy;
 use tempfile::TempDir;

-use crate::common::{
-    default_settings, shared_index_with_documents, shared_index_with_nested_documents, Server,
-    DOCUMENTS, FRUITS_DOCUMENTS, NESTED_DOCUMENTS, SCORE_DOCUMENTS, VECTOR_DOCUMENTS,
-};
+use crate::common::{default_settings, Server, Value};
 use crate::json;

+static DOCUMENTS: Lazy<Value> = Lazy::new(|| {
+    json!([
+        {
+            "title": "Shazam!",
+            "id": "287947",
+            "_vectors": { "manual": [1, 2, 3]},
+        },
+        {
+            "title": "Captain Marvel",
+            "id": "299537",
+            "_vectors": { "manual": [1, 2, 54] },
+        },
+        {
+            "title": "Escape Room",
+            "id": "522681",
+            "_vectors": { "manual": [10, -23, 32] },
+        },
+        {
+            "title": "How to Train Your Dragon: The Hidden World",
+            "id": "166428",
+            "_vectors": { "manual": [-100, 231, 32] },
+        },
+        {
+            "title": "Gläss",
+            "id": "450465",
+            "_vectors": { "manual": [-100, 340, 90] },
+        }
+    ])
+});
+
+static SCORE_DOCUMENTS: Lazy<Value> = Lazy::new(|| {
+    json!([
+        {
+            "title": "Batman the dark knight returns: Part 1",
+            "id": "A",
+        },
+        {
+            "title": "Batman the dark knight returns: Part 2",
+            "id": "B",
+        },
+        {
+            "title": "Batman Returns",
+            "id": "C",
+        },
+        {
+            "title": "Batman",
+            "id": "D",
+        },
+        {
+            "title": "Badman",
+            "id": "E",
+        }
+    ])
+});
+
+static NESTED_DOCUMENTS: Lazy<Value> = Lazy::new(|| {
+    json!([
+        {
+            "id": 852,
+            "father": "jean",
+            "mother": "michelle",
+            "doggos": [
+                {
+                    "name": "bobby",
+                    "age": 2,
+                },
+                {
+                    "name": "buddy",
+                    "age": 4,
+                },
+            ],
+            "cattos": "pésti",
+            "_vectors": { "manual": [1, 2, 3]},
+        },
+        {
+            "id": 654,
+            "father": "pierre",
+            "mother": "sabine",
+            "doggos": [
+                {
+                    "name": "gros bill",
+                    "age": 8,
+                },
+            ],
+            "cattos": ["simba", "pestiféré"],
+            "_vectors": { "manual": [1, 2, 54] },
+        },
+        {
+            "id": 750,
+            "father": "romain",
+            "mother": "michelle",
+            "cattos": ["enigma"],
+            "_vectors": { "manual": [10, 23, 32] },
+        },
+        {
+            "id": 951,
+            "father": "jean-baptiste",
+            "mother": "sophie",
+            "doggos": [
+                {
+                    "name": "turbo",
+                    "age": 5,
+                },
+                {
+                    "name": "fast",
+                    "age": 6,
+                },
+            ],
+            "cattos": ["moumoute", "gomez"],
+            "_vectors": { "manual": [10, 23, 32] },
+        },
+    ])
+});
+
+static FRUITS_DOCUMENTS: Lazy<Value> = Lazy::new(|| {
+    json!([
+        {
+            "name": "Exclusive sale: green apple",
+            "id": "green-apple-boosted",
+            "BOOST": true
+        },
+        {
+            "name": "Pear",
+            "id": "pear",
+        },
+        {
+            "name": "Red apple gala",
+            "id": "red-apple-gala",
+        },
+        {
+            "name": "Exclusive sale: Red Tomato",
+            "id": "red-tomatoes-boosted",
+            "BOOST": true
+        },
+        {
+            "name": "Exclusive sale: Red delicious apple",
+            "id": "red-delicious-boosted",
+            "BOOST": true,
+        }
+    ])
+});
+
+static VECTOR_DOCUMENTS: Lazy<Value> = Lazy::new(|| {
+    json!([
+      {
+        "id": "A",
+        "description": "the dog barks at the cat",
+        "_vectors": {
+          // dimensions [canine, feline, young]
+          "animal": [0.9, 0.8, 0.05],
+          // dimensions [negative/positive, energy]
+          "sentiment": [-0.1, 0.55]
+        }
+      },
+      {
+        "id": "B",
+        "description": "the kitten scratched the beagle",
+        "_vectors": {
+          // dimensions [canine, feline, young]
+          "animal": [0.8, 0.9, 0.5],
+          // dimensions [negative/positive, energy]
+          "sentiment": [-0.2, 0.65]
+        }
+      },
+      {
+        "id": "C",
+        "description": "the dog had to stay alone today",
+        "_vectors": {
+          // dimensions [canine, feline, young]
+          "animal": [0.85, 0.02, 0.1],
+          // dimensions [negative/positive, energy]
+          "sentiment": [-1.0, 0.1]
+        }
+      },
+      {
+        "id": "D",
+        "description": "the little boy pets the puppy",
+        "_vectors": {
+          // dimensions [canine, feline, young]
+          "animal": [0.8, 0.09, 0.8],
+          // dimensions [negative/positive, energy]
+          "sentiment": [0.8, 0.3]
+        }
+      },
+    ])
+});
+
 #[actix_rt::test]
 async fn simple_placeholder_search() {
-    let index = shared_index_with_documents().await;
+    let server = Server::new().await;
+    let index = server.index("basic");
+
+    let documents = DOCUMENTS.clone();
+    index.add_documents(documents, None).await;
+    index.wait_task(0).await;
+
    index
        .search(json!({}), |response, code| {
            assert_eq!(code, 200, "{}", response);
@@ -34,7 +223,11 @@ async fn simple_placeholder_search() {
        })
        .await;

-    let index = shared_index_with_nested_documents().await;
+    let index = server.index("nested");
+    let documents = NESTED_DOCUMENTS.clone();
+    index.add_documents(documents, None).await;
+    index.wait_task(1).await;
+
    index
        .search(json!({}), |response, code| {
            assert_eq!(code, 200, "{}", response);
@@ -45,7 +238,13 @@ async fn simple_placeholder_search() {

 #[actix_rt::test]
 async fn simple_search() {
-    let index = shared_index_with_documents().await;
+    let server = Server::new().await;
+    let index = server.index("test");
+
+    let documents = DOCUMENTS.clone();
+    index.add_documents(documents, None).await;
+    index.wait_task(0).await;
+
    index
        .search(json!({"q": "glass"}), |response, code| {
            assert_eq!(code, 200, "{}", response);
@@ -53,7 +252,11 @@ async fn simple_search() {
        })
        .await;

-    let index = shared_index_with_nested_documents().await;
+    let index = server.index("nested");
+    let documents = NESTED_DOCUMENTS.clone();
+    index.add_documents(documents, None).await;
+    index.wait_task(1).await;
+
    index
        .search(json!({"q": "pésti"}), |response, code| {
            assert_eq!(code, 200, "{}", response);
@@ -85,7 +288,13 @@ async fn phrase_search_with_stop_word() {

 #[actix_rt::test]
 async fn negative_phrase_search() {
-    let index = shared_index_with_documents().await;
+    let server = Server::new().await;
+    let index = server.index("test");
+
+    let documents = DOCUMENTS.clone();
+    index.add_documents(documents, None).await;
+    index.wait_task(0).await;
+
    index
        .search(json!({"q": "-\"train your dragon\"" }), |response, code| {
            assert_eq!(code, 200, "{}", response);
@@ -101,7 +310,13 @@ async fn negative_phrase_search() {

 #[actix_rt::test]
 async fn negative_word_search() {
-    let index = shared_index_with_documents().await;
+    let server = Server::new().await;
+    let index = server.index("test");
+
+    let documents = DOCUMENTS.clone();
+    index.add_documents(documents, None).await;
+    index.wait_task(0).await;
+
    index
        .search(json!({"q": "-escape" }), |response, code| {
            assert_eq!(code, 200, "{}", response);
@@ -126,7 +341,13 @@ async fn negative_word_search() {

 #[actix_rt::test]
 async fn non_negative_search() {
-    let index = shared_index_with_documents().await;
+    let server = Server::new().await;
+    let index = server.index("test");
+
+    let documents = DOCUMENTS.clone();
+    index.add_documents(documents, None).await;
+    index.wait_task(0).await;
+
    index
        .search(json!({"q": "- escape" }), |response, code| {
            assert_eq!(code, 200, "{}", response);
@@ -170,7 +391,6 @@ async fn negative_special_cases_search() {
 }

 #[cfg(feature = "default")]
-#[cfg(not(feature = "chinese-pinyin"))]
 #[actix_rt::test]
 async fn test_kanji_language_detection() {
    let server = Server::new().await;
@@ -219,7 +439,13 @@ async fn test_thai_language() {

 #[actix_rt::test]
 async fn search_multiple_params() {
-    let index = shared_index_with_documents().await;
+    let server = Server::new().await;
+    let index = server.index("test");
+
+    let documents = DOCUMENTS.clone();
+    index.add_documents(documents, None).await;
+    index.wait_task(0).await;
+
    index
        .search(
            json!({
@@ -236,7 +462,11 @@ async fn search_multiple_params() {
        )
        .await;

-    let index = shared_index_with_nested_documents().await;
+    let index = server.index("nested");
+    let documents = NESTED_DOCUMENTS.clone();
+    index.add_documents(documents, None).await;
+    index.wait_task(1).await;
+
    index
        .search(
            json!({
@@ -322,7 +552,15 @@ async fn search_with_filter_string_notation() {

 #[actix_rt::test]
 async fn search_with_filter_array_notation() {
-    let index = shared_index_with_documents().await;
+    let server = Server::new().await;
+    let index = server.index("test");
+
+    index.update_settings(json!({"filterableAttributes": ["title"]})).await;
+
+    let documents = DOCUMENTS.clone();
+    index.add_documents(documents, None).await;
+    index.wait_task(1).await;
+
    let (response, code) = index
        .search_post(json!({
            "filter": ["title = Gläss"]
@@ -368,7 +606,15 @@ async fn search_with_contains_filter() {

 #[actix_rt::test]
 async fn search_with_sort_on_numbers() {
-    let index = shared_index_with_documents().await;
+    let server = Server::new().await;
+    let index = server.index("test");
+
+    index.update_settings(json!({"sortableAttributes": ["id"]})).await;
+
+    let documents = DOCUMENTS.clone();
+    index.add_documents(documents, None).await;
+    index.wait_task(1).await;
+
    index
        .search(
            json!({
@@ -381,7 +627,14 @@ async fn search_with_sort_on_numbers() {
        )
        .await;

-    let index = shared_index_with_nested_documents().await;
+    let index = server.index("nested");
+
+    index.update_settings(json!({"sortableAttributes": ["doggos.age"]})).await;
+
+    let documents = NESTED_DOCUMENTS.clone();
+    index.add_documents(documents, None).await;
+    index.wait_task(3).await;
+
    index
        .search(
            json!({
@@ -397,7 +650,15 @@ async fn search_with_sort_on_numbers() {

 #[actix_rt::test]
 async fn search_with_sort_on_strings() {
-    let index = shared_index_with_documents().await;
+    let server = Server::new().await;
+    let index = server.index("test");
+
+    index.update_settings(json!({"sortableAttributes": ["title"]})).await;
+
+    let documents = DOCUMENTS.clone();
+    index.add_documents(documents, None).await;
+    index.wait_task(1).await;
+
    index
        .search(
            json!({
@@ -410,7 +671,14 @@ async fn search_with_sort_on_strings() {
        )
        .await;

-    let index = shared_index_with_nested_documents().await;
+    let index = server.index("nested");
+
+    index.update_settings(json!({"sortableAttributes": ["doggos.name"]})).await;
+
+    let documents = NESTED_DOCUMENTS.clone();
+    index.add_documents(documents, None).await;
+    index.wait_task(3).await;
+
    index
        .search(
            json!({
@@ -426,7 +694,15 @@ async fn search_with_sort_on_strings() {

 #[actix_rt::test]
 async fn search_with_multiple_sort() {
-    let index = shared_index_with_documents().await;
+    let server = Server::new().await;
+    let index = server.index("test");
+
+    index.update_settings(json!({"sortableAttributes": ["id", "title"]})).await;
+
+    let documents = DOCUMENTS.clone();
+    index.add_documents(documents, None).await;
+    index.wait_task(1).await;
+
    let (response, code) = index
        .search_post(json!({
            "sort": ["id:asc", "title:desc"]
@@ -438,7 +714,15 @@ async fn search_with_multiple_sort() {

 #[actix_rt::test]
 async fn search_facet_distribution() {
-    let index = shared_index_with_documents().await;
+    let server = Server::new().await;
+    let index = server.index("test");
+
+    index.update_settings(json!({"filterableAttributes": ["title"]})).await;
+
+    let documents = DOCUMENTS.clone();
+    index.add_documents(documents, None).await;
+    index.wait_task(1).await;
+
    index
        .search(
            json!({
@@ -453,7 +737,13 @@ async fn search_facet_distribution() {
        )
        .await;

-    let index = shared_index_with_nested_documents().await;
+    let index = server.index("nested");
+
+    index.update_settings(json!({"filterableAttributes": ["father", "doggos.name"]})).await;
+
+    let documents = NESTED_DOCUMENTS.clone();
+    index.add_documents(documents, None).await;
+    index.wait_task(3).await;

    // TODO: TAMO: fix the test
    index
@@ -480,6 +770,9 @@ async fn search_facet_distribution() {
        )
        .await;

+    index.update_settings(json!({"filterableAttributes": ["doggos"]})).await;
+    index.wait_task(4).await;
+
    index
        .search(
            json!({
@@ -515,6 +808,9 @@ async fn search_facet_distribution() {
        )
        .await;

+    index.update_settings(json!({"filterableAttributes": ["doggos.name"]})).await;
+    index.wait_task(5).await;
+
    index
        .search(
            json!({
@@ -744,10 +1040,6 @@ async fn test_score_details() {
                  {
                    "title": "How to Train Your Dragon: The Hidden World",
                    "id": "166428",
-                    "color": [
-                      "green",
-                      "red"
-                    ],
                    "_vectors": {
                      "manual": [
                        -100.0,
@@ -1099,28 +1391,22 @@ async fn experimental_feature_vector_store() {
    index.add_documents(json!(documents), None).await;
    index.wait_task(0).await;

-    let (response, code) = index
-        .search_post(json!({
+    index
+        .search(json!({
            "vector": [1.0, 2.0, 3.0],
-            "hybrid": {
-              "embedder": "manual",
-            },
            "showRankingScore": true
-        }))
+        }), |response, code|{
+            meili_snap::snapshot!(code, @"400 Bad Request");
+            meili_snap::snapshot!(meili_snap::json_string!(response), @r###"
+            {
+              "message": "Passing `vector` as a parameter requires enabling the `vector store` experimental feature. See https://github.com/meilisearch/product/discussions/677",
+              "code": "feature_not_enabled",
+              "type": "invalid_request",
+              "link": "https://docs.meilisearch.com/errors#feature_not_enabled"
+            }
+            "###);
+        })
        .await;
-
-    {
-        meili_snap::snapshot!(code, @"400 Bad Request");
-        meili_snap::snapshot!(meili_snap::json_string!(response), @r###"
-          {
-            "message": "Passing `vector` as a parameter requires enabling the `vector store` experimental feature. See https://github.com/meilisearch/product/discussions/677",
-            "code": "feature_not_enabled",
-            "type": "invalid_request",
-            "link": "https://docs.meilisearch.com/errors#feature_not_enabled"
-          }
-          "###);
-    }
-
    index
        .search(json!({
            "retrieveVectors": true,
@@ -1168,9 +1454,6 @@ async fn experimental_feature_vector_store() {
    let (response, code) = index
        .search_post(json!({
            "vector": [1.0, 2.0, 3.0],
-            "hybrid": {
-              "embedder": "manual",
-            },
            "showRankingScore": true,
            "retrieveVectors": true,
        }))
@@ -1183,10 +1466,6 @@ async fn experimental_feature_vector_store() {
      {
        "title": "Shazam!",
        "id": "287947",
-        "color": [
-          "green",
-          "blue"
-        ],
        "_vectors": {
          "manual": {
            "embeddings": [
@@ -1204,10 +1483,6 @@ async fn experimental_feature_vector_store() {
      {
        "title": "Captain Marvel",
        "id": "299537",
-        "color": [
-          "yellow",
-          "blue"
-        ],
        "_vectors": {
          "manual": {
            "embeddings": [
@@ -1225,10 +1500,6 @@ async fn experimental_feature_vector_store() {
      {
        "title": "Gläss",
        "id": "450465",
-        "color": [
-          "blue",
-          "red"
-        ],
        "_vectors": {
          "manual": {
            "embeddings": [
@@ -1246,10 +1517,6 @@ async fn experimental_feature_vector_store() {
      {
        "title": "How to Train Your Dragon: The Hidden World",
        "id": "166428",
-        "color": [
-          "green",
-          "red"
-        ],
        "_vectors": {
          "manual": {
            "embeddings": [
@@ -1267,10 +1534,6 @@ async fn experimental_feature_vector_store() {
      {
        "title": "Escape Room",
        "id": "522681",
-        "color": [
-          "yellow",
-          "red"
-        ],
        "_vectors": {
          "manual": {
            "embeddings": [
@@ -1537,10 +1800,6 @@ async fn simple_search_with_strange_synonyms() {
              {
                "title": "How to Train Your Dragon: The Hidden World",
                "id": "166428",
-                "color": [
-                  "green",
-                  "red"
-                ],
                "_vectors": {
                  "manual": [
                    -100.0,
@@ -1562,10 +1821,6 @@ async fn simple_search_with_strange_synonyms() {
              {
                "title": "How to Train Your Dragon: The Hidden World",
                "id": "166428",
-                "color": [
-                  "green",
-                  "red"
-                ],
                "_vectors": {
                  "manual": [
                    -100.0,
@@ -1587,10 +1842,6 @@ async fn simple_search_with_strange_synonyms() {
              {
                "title": "How to Train Your Dragon: The Hidden World",
                "id": "166428",
-                "color": [
-                  "green",
-                  "red"
-                ],
                "_vectors": {
                  "manual": [
                    -100.0,
--- a/meilisearch/tests/search/multi.rs
+++ b/meilisearch/tests/search/multi.rs
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Clément Renault	4d92df1b95	Disable sled logging	2024-07-22 14:38:33 +02:00
Clément Renault	ca332883cc	Use an LRU only with 1000 entries	2024-07-22 13:39:20 +02:00
Clément Renault	6264dbf326	Increase the ARCache to 500 entries	2024-07-21 23:08:11 +02:00
Clément Renault	2b7b18fb5f	Fix one and for all the ARC cache	2024-07-21 22:32:14 +02:00
Clément Renault	b03ec3f603	Another algorithm for the ARC cache	2024-07-21 18:56:50 +02:00
Clément Renault	91ec0bdaf4	Replace the SmallVec by a Vec	2024-07-21 18:22:50 +02:00
Clément Renault	56329633d5	Implement a really adaptative cache	2024-07-21 17:46:51 +02:00
Clément Renault	507bce791b	Make sure all keys are prefixed	2024-07-21 15:40:32 +02:00
Clément Renault	7adc715783	Also count the direct_inserts	2024-07-20 17:15:33 +02:00
Clément Renault	f355cf6985	Use sled to count the write insertions	2024-07-20 11:16:57 +02:00
Clément Renault	2603d8d0d0	Add a way to disable the cache	2024-07-20 10:45:16 +02:00
Clément Renault	9b3d303b08	First ArcCache version	2024-07-20 10:45:15 +02:00
Clément Renault	16b4545d23	Prefix Redis keys to avoid false negative excessive writes	2024-07-20 10:45:15 +02:00
Clément Renault	0e08906fcb	Use the sorter cache when collection prefix docids	2024-07-20 10:45:15 +02:00
Clément Renault	a3beaa90c5	Use the sorter cache when extracting the facet number docids	2024-07-20 10:45:15 +02:00
Clément Renault	02fff51902	Use the sorter cache when extracting the facet string docids	2024-07-20 10:45:15 +02:00
Clément Renault	54e2e2aa4a	Use the sorter cache when extracting the word counts	2024-07-20 10:45:14 +02:00
Clément Renault	092a383419	Use the sorter cache when extracting the word pair proximity docids	2024-07-20 10:45:14 +02:00
Clément Renault	98d55e0d4d	Use the sorter cache when extracting the word position docids	2024-07-20 10:45:14 +02:00
Clément Renault	8319552e7d	Use the sorter cache in the word docids extractor	2024-07-20 10:45:14 +02:00
Clément Renault	5d5769fd8a	Introduce a new Sorter Cache for CboRoaringBitmaps	2024-07-20 10:45:14 +02:00
Clément Renault	eafc097a85	Measure much more places where we insert in sorters	2024-07-20 10:45:13 +02:00
Clément Renault	f17cb2ef5b	Use Redis to measure the Sorter insertions	2024-07-20 10:45:13 +02:00