diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 4ce2db180..1a7f49aae 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -23,7 +23,8 @@ A clear and concise description of what you expected to happen.
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 
-**Meilisearch version:** [e.g. v0.20.0]
+**Meilisearch version:**
+[e.g. v0.20.0]
 
 **Additional context**
 Additional information that may be relevant to the issue.
diff --git a/.github/ISSUE_TEMPLATE/sprint_issue.md b/.github/ISSUE_TEMPLATE/sprint_issue.md
new file mode 100644
index 000000000..f6303e362
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/sprint_issue.md
@@ -0,0 +1,34 @@
+---
+name: New sprint issue
+about: ⚠️ Should only be used by the engine team ⚠️
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+Related product team resources: [roadmap card]() (_internal only_) and [PRD]() (_internal only_)
+Related product discussion:
+Related spec: WIP
+
+## Motivation
+
+<!---Copy/paste the information in the roadmap resources or briefly detail the product motivation. Ask product team if any hesitation.-->
+
+## Usage
+
+<!---Write a quick description of the usage if the usage has already been defined-->
+
+Refer to the final spec to know the details and the final decisions about the usage.
+
+## TODO
+
+<!---Feel free to adapt this list with more technical/product steps-->
+
+- [ ] Release a prototype
+- [ ] If prototype validated, merge changes into `main`
+- [ ] Update the spec
+
+## Impacted teams
+
+<!---Ping the related teams. Ask for the engine manager if any hesitation-->
diff --git a/.github/workflows/publish-binaries.yml b/.github/workflows/publish-binaries.yml
index 02253a375..76558f3b1 100644
--- a/.github/workflows/publish-binaries.yml
+++ b/.github/workflows/publish-binaries.yml
@@ -96,14 +96,12 @@ jobs:
 
   publish-macos-apple-silicon:
     name: Publish binary for macOS silicon
-    runs-on: ${{ matrix.os }}
+    runs-on: macos-12
     needs: check-version
     strategy:
-      fail-fast: false
       matrix:
         include:
-          - os: macos-12
-            target: aarch64-apple-darwin
+          - target: aarch64-apple-darwin
             asset_name: meilisearch-macos-apple-silicon
     steps:
       - name: Checkout repository
@@ -132,21 +130,29 @@ jobs:
 
   publish-aarch64:
     name: Publish binary for aarch64
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     needs: check-version
+    container:
+      # Use ubuntu-18.04 to compile with glibc 2.27
+      image: ubuntu:18.04
     strategy:
-      fail-fast: false
       matrix:
         include:
-          - build: aarch64
-            os: ubuntu-18.04
-            target: aarch64-unknown-linux-gnu
-            linker: gcc-aarch64-linux-gnu
-            use-cross: true
+          - target: aarch64-unknown-linux-gnu
             asset_name: meilisearch-linux-aarch64
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
+      - name: Install needed dependencies
+        run: |
+          apt-get update -y && apt upgrade -y
+          apt-get install -y curl build-essential gcc-aarch64-linux-gnu
+      - name: Set up Docker for cross compilation
+        run: |
+          apt-get install -y curl apt-transport-https ca-certificates software-properties-common
+          curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
+          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: actions-rs/toolchain@v1
         with:
@@ -154,15 +160,7 @@ jobs:
           profile: minimal
           target: ${{ matrix.target }}
           override: true
-      - name: APT update
-        run: |
-          sudo apt update
-      - name: Install target specific tools
-        if: matrix.use-cross
-        run: |
-          sudo apt-get install -y ${{ matrix.linker }}
       - name: Configure target aarch64 GNU
-        if: matrix.target == 'aarch64-unknown-linux-gnu'
         ## Environment variable is not passed using env:
         ## LD gold won't work with MUSL
         # env:
@@ -176,8 +174,10 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: build
-          use-cross: ${{ matrix.use-cross }}
+          use-cross: true
           args: --release --target ${{ matrix.target }}
+        env:
+          CROSS_DOCKER_IN_DOCKER: true
       - name: List target output files
         run: ls -lR ./target
       - name: Upload the binary to release
diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml
index e08b77e3d..820fcb656 100644
--- a/.github/workflows/test-suite.yml
+++ b/.github/workflows/test-suite.yml
@@ -43,7 +43,7 @@ jobs:
           toolchain: nightly
           override: true
       - name: Cache dependencies
-        uses: Swatinem/rust-cache@v2.2.0
+        uses: Swatinem/rust-cache@v2.2.1
       - name: Run cargo check without any default features
         uses: actions-rs/cargo@v1
         with:
@@ -65,7 +65,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Cache dependencies
-        uses: Swatinem/rust-cache@v2.2.0
+        uses: Swatinem/rust-cache@v2.2.1
       - name: Run cargo check without any default features
         uses: actions-rs/cargo@v1
         with:
@@ -123,7 +123,7 @@ jobs:
           toolchain: stable
           override: true
       - name: Cache dependencies
-        uses: Swatinem/rust-cache@v2.2.0
+        uses: Swatinem/rust-cache@v2.2.1
       - name: Run tests in debug
         uses: actions-rs/cargo@v1
         with:
@@ -142,7 +142,7 @@ jobs:
           override: true
           components: clippy
       - name: Cache dependencies
-        uses: Swatinem/rust-cache@v2.2.0
+        uses: Swatinem/rust-cache@v2.2.1
       - name: Run cargo clippy
         uses: actions-rs/cargo@v1
         with:
@@ -162,7 +162,7 @@ jobs:
           override: true
           components: rustfmt
       - name: Cache dependencies
-        uses: Swatinem/rust-cache@v2.2.0
+        uses: Swatinem/rust-cache@v2.2.1
       - name: Run cargo fmt
         # Since we never ran the `build.rs` script in the benchmark directory we are missing one auto-generated import file.
         # Since we want to trigger (and fail) this action as fast as possible, instead of building the benchmark crate
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 31fe45a94..a4255f1e7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -120,29 +120,9 @@ The full Meilisearch release process is described in [this guide](https://github
 
 Depending on the developed feature, you might need to provide a prototyped version of Meilisearch to make it easier to test by the users.
 
-The prototype name must follow this convention: `prototype-X-Y` where
-- `X` is the feature name formatted in `kebab-case`. It should not end with a single number.
-- `Y` is the version of the prototype, starting from `0`.
-
-✅ Example: `prototype-auto-resize-0`. </br>
-❌ Bad example: `auto-resize-0`: lacks the `prototype` prefix. </br>
-❌ Bad example: `prototype-auto-resize`: lacks the version suffix. </br>
-❌ Bad example: `prototype-auto-resize-0-0`: feature name ends with a single number.
-
-Steps to create a prototype:
-
-1. In your terminal, go to the last commit of your branch (the one you want to provide as a prototype).
-2. Create a tag following the convention: `git tag prototype-X-Y`
-3. Run Meilisearch and check that its launch summary features a line: `Prototype: prototype-X-Y` (you may need to switch branches and back after tagging for this to work).
-3. Push the tag: `git push origin prototype-X-Y`
-4. Check the [Docker CI](https://github.com/meilisearch/meilisearch/actions/workflows/publish-docker-images.yml) is now running.
-
-🐳 Once the CI has finished to run (~1h30), a Docker image named `prototype-X-Y` will be available on [DockerHub](https://hub.docker.com/repository/docker/getmeili/meilisearch/general). People can use it with the following command: `docker run -p 7700:7700 -v $(pwd)/meili_data:/meili_data getmeili/meilisearch:prototype-X-Y`. <br>
-More information about [how to run Meilisearch with Docker](https://docs.meilisearch.com/learn/cookbooks/docker.html#download-meilisearch-with-docker).
-
-⚙️ However, no binaries will be created. If the users do not use Docker, they can go to the `prototype-X-Y` tag in the Meilisearch repository and compile from the source code.
-
-⚠️ When sharing a prototype with users, remind them to not use it in production. Prototypes are solely for test purposes.
+This happens in two steps:
+- [Release the prototype](https://github.com/meilisearch/engine-team/blob/main/resources/prototypes.md#how-to-publish-a-prototype)
+- [Communicate about it](https://github.com/meilisearch/engine-team/blob/main/resources/prototypes.md#communication)
 
 ### Release assets
 
diff --git a/filter-parser/src/error.rs b/filter-parser/src/error.rs
index 4d9d89859..6de9526fd 100644
--- a/filter-parser/src/error.rs
+++ b/filter-parser/src/error.rs
@@ -159,7 +159,7 @@ impl<'a> Display for Error<'a> {
                 writeln!(f, "The `_geoBoundingBox` filter expects two pairs of arguments: `_geoBoundingBox([latitude, longitude], [latitude, longitude])`.")?
             }
             ErrorKind::ReservedGeo(name) => {
-                writeln!(f, "`{}` 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.", name.escape_debug())?
+                writeln!(f, "`{}` 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.", name.escape_debug())?
             }
             ErrorKind::MisusedGeoRadius => {
                 writeln!(f, "The `_geoRadius` filter is an operation and can't be used as a value.")?
diff --git a/filter-parser/src/lib.rs b/filter-parser/src/lib.rs
index 8e21ff6be..588953f70 100644
--- a/filter-parser/src/lib.rs
+++ b/filter-parser/src/lib.rs
@@ -141,7 +141,7 @@ pub enum FilterCondition<'a> {
     Or(Vec<Self>),
     And(Vec<Self>),
     GeoLowerThan { point: [Token<'a>; 2], radius: Token<'a> },
-    GeoBoundingBox { top_left_point: [Token<'a>; 2], bottom_right_point: [Token<'a>; 2] },
+    GeoBoundingBox { top_right_point: [Token<'a>; 2], bottom_left_point: [Token<'a>; 2] },
 }
 
 impl<'a> FilterCondition<'a> {
@@ -362,8 +362,8 @@ fn parse_geo_bounding_box(input: Span) -> IResult<FilterCondition> {
     }
 
     let res = FilterCondition::GeoBoundingBox {
-        top_left_point: [args[0][0].into(), args[0][1].into()],
-        bottom_right_point: [args[1][0].into(), args[1][1].into()],
+        top_right_point: [args[0][0].into(), args[0][1].into()],
+        bottom_left_point: [args[1][0].into(), args[1][1].into()],
     };
     Ok((input, res))
 }
@@ -382,6 +382,34 @@ fn parse_geo_point(input: Span) -> IResult<FilterCondition> {
     Err(nom::Err::Failure(Error::new_from_kind(input, ErrorKind::ReservedGeo("_geoPoint"))))
 }
 
+/// geoPoint      = WS* "_geoDistance(float WS* "," WS* float WS* "," WS* float)
+fn parse_geo_distance(input: Span) -> IResult<FilterCondition> {
+    // we want to forbid space BEFORE the _geoDistance but not after
+    tuple((
+        multispace0,
+        tag("_geoDistance"),
+        // if we were able to parse `_geoDistance` we are going to return a Failure whatever happens next.
+        cut(delimited(char('('), separated_list1(tag(","), ws(recognize_float)), char(')'))),
+    ))(input)
+    .map_err(|e| e.map(|_| Error::new_from_kind(input, ErrorKind::ReservedGeo("_geoDistance"))))?;
+    // if we succeeded we still return a `Failure` because `geoDistance` filters are not allowed
+    Err(nom::Err::Failure(Error::new_from_kind(input, ErrorKind::ReservedGeo("_geoDistance"))))
+}
+
+/// geo      = WS* "_geo(float WS* "," WS* float WS* "," WS* float)
+fn parse_geo(input: Span) -> IResult<FilterCondition> {
+    // we want to forbid space BEFORE the _geo but not after
+    tuple((
+        multispace0,
+        word_exact("_geo"),
+        // if we were able to parse `_geo` we are going to return a Failure whatever happens next.
+        cut(delimited(char('('), separated_list1(tag(","), ws(recognize_float)), char(')'))),
+    ))(input)
+    .map_err(|e| e.map(|_| Error::new_from_kind(input, ErrorKind::ReservedGeo("_geo"))))?;
+    // if we succeeded we still return a `Failure` because `_geo` filter is not allowed
+    Err(nom::Err::Failure(Error::new_from_kind(input, ErrorKind::ReservedGeo("_geo"))))
+}
+
 fn parse_error_reserved_keyword(input: Span) -> IResult<FilterCondition> {
     match parse_condition(input) {
         Ok(result) => Ok(result),
@@ -418,6 +446,8 @@ fn parse_primary(input: Span, depth: usize) -> IResult<FilterCondition> {
         parse_not_exists,
         parse_to,
         // 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,
         parse_geo_point,
         parse_error_reserved_keyword,
     ))(input)
@@ -621,15 +651,35 @@ pub mod tests {
         "###);
 
         insta::assert_display_snapshot!(p("_geoPoint(12, 13, 14)"), @r###"
-        `_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.
+        `_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.
         1:22 _geoPoint(12, 13, 14)
         "###);
 
         insta::assert_display_snapshot!(p("position <= _geoPoint(12, 13, 14)"), @r###"
-        `_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.
+        `_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.
         13:34 position <= _geoPoint(12, 13, 14)
         "###);
 
+        insta::assert_display_snapshot!(p("_geoDistance(12, 13, 14)"), @r###"
+        `_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.
+        1:25 _geoDistance(12, 13, 14)
+        "###);
+
+        insta::assert_display_snapshot!(p("position <= _geoDistance(12, 13, 14)"), @r###"
+        `_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.
+        13:37 position <= _geoDistance(12, 13, 14)
+        "###);
+
+        insta::assert_display_snapshot!(p("_geo(12, 13, 14)"), @r###"
+        `_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.
+        1:17 _geo(12, 13, 14)
+        "###);
+
+        insta::assert_display_snapshot!(p("position <= _geo(12, 13, 14)"), @r###"
+        `_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.
+        13:29 position <= _geo(12, 13, 14)
+        "###);
+
         insta::assert_display_snapshot!(p("position <= _geoRadius(12, 13, 14)"), @r###"
         The `_geoRadius` filter is an operation and can't be used as a value.
         13:35 position <= _geoRadius(12, 13, 14)
@@ -780,7 +830,10 @@ impl<'a> std::fmt::Display for FilterCondition<'a> {
             FilterCondition::GeoLowerThan { point, radius } => {
                 write!(f, "_geoRadius({}, {}, {})", point[0], point[1], radius)
             }
-            FilterCondition::GeoBoundingBox { top_left_point, bottom_right_point } => {
+            FilterCondition::GeoBoundingBox {
+                top_right_point: top_left_point,
+                bottom_left_point: bottom_right_point,
+            } => {
                 write!(
                     f,
                     "_geoBoundingBox([{}, {}], [{}, {}])",
diff --git a/filter-parser/src/value.rs b/filter-parser/src/value.rs
index 2296c0769..fb8f35503 100644
--- a/filter-parser/src/value.rs
+++ b/filter-parser/src/value.rs
@@ -7,8 +7,8 @@ use nom::{InputIter, InputLength, InputTake, Slice};
 
 use crate::error::{ExpectedValueKind, NomErrorExt};
 use crate::{
-    parse_geo_bounding_box, parse_geo_point, parse_geo_radius, Error, ErrorKind, IResult, Span,
-    Token,
+    parse_geo, parse_geo_bounding_box, parse_geo_distance, parse_geo_point, parse_geo_radius,
+    Error, ErrorKind, IResult, Span, Token,
 };
 
 /// This function goes through all characters in the [Span] if it finds any escaped character (`\`).
@@ -88,11 +88,16 @@ pub fn parse_value(input: Span) -> IResult<Token> {
     // then, we want to check if the user is misusing a geo expression
     // This expression can’t finish without error.
     // We want to return an error in case of failure.
-    if let Err(err) = parse_geo_point(input) {
-        if err.is_failure() {
-            return Err(err);
+    let geo_reserved_parse_functions = [parse_geo_point, parse_geo_distance, parse_geo];
+
+    for parser in geo_reserved_parse_functions {
+        if let Err(err) = parser(input) {
+            if err.is_failure() {
+                return Err(err);
+            }
         }
     }
+
     match parse_geo_radius(input) {
         Ok(_) => {
             return Err(nom::Err::Failure(Error::new_from_kind(input, ErrorKind::MisusedGeoRadius)))
diff --git a/index-scheduler/src/batch.rs b/index-scheduler/src/batch.rs
index 66c516d9b..9c24e8e9d 100644
--- a/index-scheduler/src/batch.rs
+++ b/index-scheduler/src/batch.rs
@@ -675,9 +675,6 @@ impl IndexScheduler {
                 }
 
                 // 3. Snapshot every indexes
-                // TODO we are opening all of the indexes it can be too much we should unload all
-                //      of the indexes we are trying to open. It would be even better to only unload
-                //      the ones that were opened by us. Or maybe use a LRU in the index mapper.
                 for result in self.index_mapper.index_mapping.iter(&rtxn)? {
                     let (name, uuid) = result?;
                     let index = self.index_mapper.index(&rtxn, name)?;
@@ -714,6 +711,14 @@ impl IndexScheduler {
                 // 5.3 Change the permission to make the snapshot readonly
                 let mut permissions = file.metadata()?.permissions();
                 permissions.set_readonly(true);
+                #[cfg(unix)]
+                {
+                    use std::os::unix::fs::PermissionsExt;
+                    #[allow(clippy::non_octal_unix_permissions)]
+                    //                     rwxrwxrwx
+                    permissions.set_mode(0b100100100);
+                }
+
                 file.set_permissions(permissions)?;
 
                 for task in &mut tasks {
@@ -828,20 +833,38 @@ impl IndexScheduler {
                 Ok(vec![task])
             }
             Batch::IndexOperation { op, must_create_index } => {
-                let index_uid = op.index_uid();
+                let index_uid = op.index_uid().to_string();
                 let index = if must_create_index {
                     // create the index if it doesn't already exist
                     let wtxn = self.env.write_txn()?;
-                    self.index_mapper.create_index(wtxn, index_uid, None)?
+                    self.index_mapper.create_index(wtxn, &index_uid, None)?
                 } else {
                     let rtxn = self.env.read_txn()?;
-                    self.index_mapper.index(&rtxn, index_uid)?
+                    self.index_mapper.index(&rtxn, &index_uid)?
                 };
 
                 let mut index_wtxn = index.write_txn()?;
                 let tasks = self.apply_index_operation(&mut index_wtxn, &index, op)?;
                 index_wtxn.commit()?;
 
+                // if the update processed successfully, we're going to store the new
+                // stats of the index. Since the tasks have already been processed and
+                // this is a non-critical operation. If it fails, we should not fail
+                // the entire batch.
+                let res = || -> Result<()> {
+                    let index_rtxn = index.read_txn()?;
+                    let stats = crate::index_mapper::IndexStats::new(&index, &index_rtxn)?;
+                    let mut wtxn = self.env.write_txn()?;
+                    self.index_mapper.store_stats_of(&mut wtxn, &index_uid, &stats)?;
+                    wtxn.commit()?;
+                    Ok(())
+                }();
+
+                match res {
+                    Ok(_) => (),
+                    Err(e) => error!("Could not write the stats of the index {}", e),
+                }
+
                 Ok(tasks)
             }
             Batch::IndexCreation { index_uid, primary_key, task } => {
@@ -872,9 +895,31 @@ impl IndexScheduler {
                     )?;
                     index_wtxn.commit()?;
                 }
+
+                // drop rtxn before starting a new wtxn on the same db
+                rtxn.commit()?;
+
                 task.status = Status::Succeeded;
                 task.details = Some(Details::IndexInfo { primary_key });
 
+                // if the update processed successfully, we're going to store the new
+                // stats of the index. Since the tasks have already been processed and
+                // this is a non-critical operation. If it fails, we should not fail
+                // the entire batch.
+                let res = || -> Result<()> {
+                    let mut wtxn = self.env.write_txn()?;
+                    let index_rtxn = index.read_txn()?;
+                    let stats = crate::index_mapper::IndexStats::new(&index, &index_rtxn)?;
+                    self.index_mapper.store_stats_of(&mut wtxn, &index_uid, &stats)?;
+                    wtxn.commit()?;
+                    Ok(())
+                }();
+
+                match res {
+                    Ok(_) => (),
+                    Err(e) => error!("Could not write the stats of the index {}", e),
+                }
+
                 Ok(vec![task])
             }
             Batch::IndexDeletion { index_uid, index_has_been_created, mut tasks } => {
diff --git a/index-scheduler/src/index_mapper/mod.rs b/index-scheduler/src/index_mapper/mod.rs
index 1693d12d7..2bf6f46ad 100644
--- a/index-scheduler/src/index_mapper/mod.rs
+++ b/index-scheduler/src/index_mapper/mod.rs
@@ -4,10 +4,11 @@ use std::time::Duration;
 use std::{fs, thread};
 
 use log::error;
-use meilisearch_types::heed::types::Str;
+use meilisearch_types::heed::types::{SerdeJson, Str};
 use meilisearch_types::heed::{Database, Env, RoTxn, RwTxn};
 use meilisearch_types::milli::update::IndexerConfig;
-use meilisearch_types::milli::Index;
+use meilisearch_types::milli::{FieldDistribution, Index};
+use serde::{Deserialize, Serialize};
 use time::OffsetDateTime;
 use uuid::Uuid;
 
@@ -19,6 +20,7 @@ use crate::{Error, Result};
 mod index_map;
 
 const INDEX_MAPPING: &str = "index-mapping";
+const INDEX_STATS: &str = "index-stats";
 
 /// Structure managing meilisearch's indexes.
 ///
@@ -52,6 +54,11 @@ pub struct IndexMapper {
 
     /// Map an index name with an index uuid currently available on disk.
     pub(crate) index_mapping: Database<Str, UuidCodec>,
+    /// Map an index UUID with the cached stats associated to the index.
+    ///
+    /// Using an UUID forces to use the index_mapping table to recover the index behind a name, ensuring
+    /// consistency wrt index swapping.
+    pub(crate) index_stats: Database<UuidCodec, SerdeJson<IndexStats>>,
 
     /// Path to the folder where the LMDB environments of each index are.
     base_path: PathBuf,
@@ -76,6 +83,39 @@ pub enum IndexStatus {
     Available(Index),
 }
 
+/// The statistics that can be computed from an `Index` object.
+#[derive(Serialize, Deserialize, Debug)]
+pub struct IndexStats {
+    /// Number of documents in the index.
+    pub number_of_documents: u64,
+    /// Size of the index' DB, in bytes.
+    pub database_size: u64,
+    /// Association of every field name with the number of times it occurs in the documents.
+    pub field_distribution: FieldDistribution,
+    /// Creation date of the index.
+    pub created_at: OffsetDateTime,
+    /// Date of the last update of the index.
+    pub updated_at: OffsetDateTime,
+}
+
+impl IndexStats {
+    /// Compute the stats of an index
+    ///
+    /// # Parameters
+    ///
+    /// - rtxn: a RO transaction for the index, obtained from `Index::read_txn()`.
+    pub fn new(index: &Index, rtxn: &RoTxn) -> Result<Self> {
+        let database_size = index.on_disk_size()?;
+        Ok(IndexStats {
+            number_of_documents: index.number_of_documents(rtxn)?,
+            database_size,
+            field_distribution: index.field_distribution(rtxn)?,
+            created_at: index.created_at(rtxn)?,
+            updated_at: index.updated_at(rtxn)?,
+        })
+    }
+}
+
 impl IndexMapper {
     pub fn new(
         env: &Env,
@@ -88,6 +128,7 @@ impl IndexMapper {
         Ok(Self {
             index_map: Arc::new(RwLock::new(IndexMap::new(index_count))),
             index_mapping: env.create_database(Some(INDEX_MAPPING))?,
+            index_stats: env.create_database(Some(INDEX_STATS))?,
             base_path,
             index_base_map_size,
             index_growth_amount,
@@ -140,6 +181,9 @@ impl IndexMapper {
             .get(&wtxn, name)?
             .ok_or_else(|| Error::IndexNotFound(name.to_string()))?;
 
+        // Not an error if the index had no stats in cache.
+        self.index_stats.delete(&mut wtxn, &uuid)?;
+
         // Once we retrieved the UUID of the index we remove it from the mapping table.
         assert!(self.index_mapping.delete(&mut wtxn, name)?);
 
@@ -360,6 +404,45 @@ impl IndexMapper {
         Ok(())
     }
 
+    /// The stats of an index.
+    ///
+    /// If available in the cache, they are directly returned.
+    /// Otherwise, the `Index` is opened to compute the stats on the fly (the result is not cached).
+    /// The stats for an index are cached after each `Index` update.
+    pub fn stats_of(&self, rtxn: &RoTxn, index_uid: &str) -> Result<IndexStats> {
+        let uuid = self
+            .index_mapping
+            .get(rtxn, index_uid)?
+            .ok_or_else(|| Error::IndexNotFound(index_uid.to_string()))?;
+
+        match self.index_stats.get(rtxn, &uuid)? {
+            Some(stats) => Ok(stats),
+            None => {
+                let index = self.index(rtxn, index_uid)?;
+                let index_rtxn = index.read_txn()?;
+                IndexStats::new(&index, &index_rtxn)
+            }
+        }
+    }
+
+    /// Stores the new stats for an index.
+    ///
+    /// Expected usage is to compute the stats the index using `IndexStats::new`, the pass it to this function.
+    pub fn store_stats_of(
+        &self,
+        wtxn: &mut RwTxn,
+        index_uid: &str,
+        stats: &IndexStats,
+    ) -> Result<()> {
+        let uuid = self
+            .index_mapping
+            .get(wtxn, index_uid)?
+            .ok_or_else(|| Error::IndexNotFound(index_uid.to_string()))?;
+
+        self.index_stats.put(wtxn, &uuid, stats)?;
+        Ok(())
+    }
+
     pub fn index_exists(&self, rtxn: &RoTxn, name: &str) -> Result<bool> {
         Ok(self.index_mapping.get(rtxn, name)?.is_some())
     }
diff --git a/index-scheduler/src/insta_snapshot.rs b/index-scheduler/src/insta_snapshot.rs
index dcc348c98..43509aa84 100644
--- a/index-scheduler/src/insta_snapshot.rs
+++ b/index-scheduler/src/insta_snapshot.rs
@@ -254,6 +254,16 @@ pub fn snapshot_canceled_by(
     snap
 }
 pub fn snapshot_index_mapper(rtxn: &RoTxn, mapper: &IndexMapper) -> String {
+    let mut s = String::new();
     let names = mapper.index_names(rtxn).unwrap();
-    format!("{names:?}")
+
+    for name in names {
+        let stats = mapper.stats_of(rtxn, &name).unwrap();
+        s.push_str(&format!(
+            "{name}: {{ number_of_documents: {}, field_distribution: {:?} }}\n",
+            stats.number_of_documents, stats.field_distribution
+        ));
+    }
+
+    s
 }
diff --git a/index-scheduler/src/lib.rs b/index-scheduler/src/lib.rs
index e23e4ff8b..13c3c6bfe 100644
--- a/index-scheduler/src/lib.rs
+++ b/index-scheduler/src/lib.rs
@@ -31,6 +31,7 @@ mod uuid_codec;
 pub type Result<T> = std::result::Result<T, Error>;
 pub type TaskId = u32;
 
+use std::collections::HashMap;
 use std::ops::{Bound, RangeBounds};
 use std::path::{Path, PathBuf};
 use std::sync::atomic::AtomicBool;
@@ -43,11 +44,10 @@ pub use error::Error;
 use file_store::FileStore;
 use meilisearch_types::error::ResponseError;
 use meilisearch_types::heed::types::{OwnedType, SerdeBincode, SerdeJson, Str};
-use meilisearch_types::heed::{self, Database, Env, RoTxn};
-use meilisearch_types::milli;
+use meilisearch_types::heed::{self, Database, Env, RoTxn, RwTxn};
 use meilisearch_types::milli::documents::DocumentsBatchBuilder;
 use meilisearch_types::milli::update::IndexerConfig;
-use meilisearch_types::milli::{CboRoaringBitmapCodec, Index, RoaringBitmapCodec, BEU32};
+use meilisearch_types::milli::{self, CboRoaringBitmapCodec, Index, RoaringBitmapCodec, BEU32};
 use meilisearch_types::tasks::{Kind, KindWithContent, Status, Task};
 use roaring::RoaringBitmap;
 use synchronoise::SignalEvent;
@@ -429,6 +429,13 @@ impl IndexScheduler {
         Ok(this)
     }
 
+    /// Return `Ok(())` if the index scheduler is able to access one of its database.
+    pub fn health(&self) -> Result<()> {
+        let rtxn = self.env.read_txn()?;
+        self.all_tasks.first(&rtxn)?;
+        Ok(())
+    }
+
     fn index_budget(
         tasks_path: &Path,
         base_map_size: usize,
@@ -566,7 +573,7 @@ impl IndexScheduler {
     }
 
     /// Return the name of all indexes without opening them.
-    pub fn index_names(self) -> Result<Vec<String>> {
+    pub fn index_names(&self) -> Result<Vec<String>> {
         let rtxn = self.env.read_txn()?;
         self.index_mapper.index_names(&rtxn)
     }
@@ -883,115 +890,8 @@ impl IndexScheduler {
 
     /// Register a new task coming from a dump in the scheduler.
     /// By taking a mutable ref we're pretty sure no one will ever import a dump while actix is running.
-    pub fn register_dumped_task(
-        &mut self,
-        task: TaskDump,
-        content_file: Option<Box<UpdateFile>>,
-    ) -> Result<Task> {
-        // Currently we don't need to access the tasks queue while loading a dump thus I can block everything.
-        let mut wtxn = self.env.write_txn()?;
-
-        let content_uuid = match content_file {
-            Some(content_file) if task.status == Status::Enqueued => {
-                let (uuid, mut file) = self.create_update_file()?;
-                let mut builder = DocumentsBatchBuilder::new(file.as_file_mut());
-                for doc in content_file {
-                    builder.append_json_object(&doc?)?;
-                }
-                builder.into_inner()?;
-                file.persist()?;
-
-                Some(uuid)
-            }
-            // If the task isn't `Enqueued` then just generate a recognisable `Uuid`
-            // in case we try to open it later.
-            _ if task.status != Status::Enqueued => Some(Uuid::nil()),
-            _ => None,
-        };
-
-        let task = Task {
-            uid: task.uid,
-            enqueued_at: task.enqueued_at,
-            started_at: task.started_at,
-            finished_at: task.finished_at,
-            error: task.error,
-            canceled_by: task.canceled_by,
-            details: task.details,
-            status: task.status,
-            kind: match task.kind {
-                KindDump::DocumentImport {
-                    primary_key,
-                    method,
-                    documents_count,
-                    allow_index_creation,
-                } => KindWithContent::DocumentAdditionOrUpdate {
-                    index_uid: task.index_uid.ok_or(Error::CorruptedDump)?,
-                    primary_key,
-                    method,
-                    content_file: content_uuid.ok_or(Error::CorruptedDump)?,
-                    documents_count,
-                    allow_index_creation,
-                },
-                KindDump::DocumentDeletion { documents_ids } => KindWithContent::DocumentDeletion {
-                    documents_ids,
-                    index_uid: task.index_uid.ok_or(Error::CorruptedDump)?,
-                },
-                KindDump::DocumentClear => KindWithContent::DocumentClear {
-                    index_uid: task.index_uid.ok_or(Error::CorruptedDump)?,
-                },
-                KindDump::Settings { settings, is_deletion, allow_index_creation } => {
-                    KindWithContent::SettingsUpdate {
-                        index_uid: task.index_uid.ok_or(Error::CorruptedDump)?,
-                        new_settings: settings,
-                        is_deletion,
-                        allow_index_creation,
-                    }
-                }
-                KindDump::IndexDeletion => KindWithContent::IndexDeletion {
-                    index_uid: task.index_uid.ok_or(Error::CorruptedDump)?,
-                },
-                KindDump::IndexCreation { primary_key } => KindWithContent::IndexCreation {
-                    index_uid: task.index_uid.ok_or(Error::CorruptedDump)?,
-                    primary_key,
-                },
-                KindDump::IndexUpdate { primary_key } => KindWithContent::IndexUpdate {
-                    index_uid: task.index_uid.ok_or(Error::CorruptedDump)?,
-                    primary_key,
-                },
-                KindDump::IndexSwap { swaps } => KindWithContent::IndexSwap { swaps },
-                KindDump::TaskCancelation { query, tasks } => {
-                    KindWithContent::TaskCancelation { query, tasks }
-                }
-                KindDump::TasksDeletion { query, tasks } => {
-                    KindWithContent::TaskDeletion { query, tasks }
-                }
-                KindDump::DumpCreation { keys, instance_uid } => {
-                    KindWithContent::DumpCreation { keys, instance_uid }
-                }
-                KindDump::SnapshotCreation => KindWithContent::SnapshotCreation,
-            },
-        };
-
-        self.all_tasks.put(&mut wtxn, &BEU32::new(task.uid), &task)?;
-
-        for index in task.indexes() {
-            self.update_index(&mut wtxn, index, |bitmap| {
-                bitmap.insert(task.uid);
-            })?;
-        }
-
-        self.update_status(&mut wtxn, task.status, |bitmap| {
-            bitmap.insert(task.uid);
-        })?;
-
-        self.update_kind(&mut wtxn, task.kind.as_kind(), |bitmap| {
-            (bitmap.insert(task.uid));
-        })?;
-
-        wtxn.commit()?;
-        self.wake_up.signal();
-
-        Ok(task)
+    pub fn register_dumped_task(&mut self) -> Result<Dump> {
+        Dump::new(self)
     }
 
     /// Create a new index without any associated task.
@@ -1186,6 +1086,14 @@ impl IndexScheduler {
         Ok(TickOutcome::TickAgain(processed_tasks))
     }
 
+    pub fn index_stats(&self, index_uid: &str) -> Result<IndexStats> {
+        let is_indexing = self.is_index_processing(index_uid)?;
+        let rtxn = self.read_txn()?;
+        let index_stats = self.index_mapper.stats_of(&rtxn, index_uid)?;
+
+        Ok(IndexStats { is_indexing, inner_stats: index_stats })
+    }
+
     pub(crate) fn delete_persisted_task_data(&self, task: &Task) -> Result<()> {
         match task.content_uuid() {
             Some(content_file) => self.delete_update_file(content_file),
@@ -1218,6 +1126,184 @@ impl IndexScheduler {
     }
 }
 
+pub struct Dump<'a> {
+    index_scheduler: &'a IndexScheduler,
+    wtxn: RwTxn<'a, 'a>,
+
+    indexes: HashMap<String, RoaringBitmap>,
+    statuses: HashMap<Status, RoaringBitmap>,
+    kinds: HashMap<Kind, RoaringBitmap>,
+}
+
+impl<'a> Dump<'a> {
+    pub(crate) fn new(index_scheduler: &'a mut IndexScheduler) -> Result<Self> {
+        // While loading a dump no one should be able to access the scheduler thus I can block everything.
+        let wtxn = index_scheduler.env.write_txn()?;
+
+        Ok(Dump {
+            index_scheduler,
+            wtxn,
+            indexes: HashMap::new(),
+            statuses: HashMap::new(),
+            kinds: HashMap::new(),
+        })
+    }
+
+    /// Register a new task coming from a dump in the scheduler.
+    /// By taking a mutable ref we're pretty sure no one will ever import a dump while actix is running.
+    pub fn register_dumped_task(
+        &mut self,
+        task: TaskDump,
+        content_file: Option<Box<UpdateFile>>,
+    ) -> Result<Task> {
+        let content_uuid = match content_file {
+            Some(content_file) if task.status == Status::Enqueued => {
+                let (uuid, mut file) = self.index_scheduler.create_update_file()?;
+                let mut builder = DocumentsBatchBuilder::new(file.as_file_mut());
+                for doc in content_file {
+                    builder.append_json_object(&doc?)?;
+                }
+                builder.into_inner()?;
+                file.persist()?;
+
+                Some(uuid)
+            }
+            // If the task isn't `Enqueued` then just generate a recognisable `Uuid`
+            // in case we try to open it later.
+            _ if task.status != Status::Enqueued => Some(Uuid::nil()),
+            _ => None,
+        };
+
+        let task = Task {
+            uid: task.uid,
+            enqueued_at: task.enqueued_at,
+            started_at: task.started_at,
+            finished_at: task.finished_at,
+            error: task.error,
+            canceled_by: task.canceled_by,
+            details: task.details,
+            status: task.status,
+            kind: match task.kind {
+                KindDump::DocumentImport {
+                    primary_key,
+                    method,
+                    documents_count,
+                    allow_index_creation,
+                } => KindWithContent::DocumentAdditionOrUpdate {
+                    index_uid: task.index_uid.ok_or(Error::CorruptedDump)?,
+                    primary_key,
+                    method,
+                    content_file: content_uuid.ok_or(Error::CorruptedDump)?,
+                    documents_count,
+                    allow_index_creation,
+                },
+                KindDump::DocumentDeletion { documents_ids } => KindWithContent::DocumentDeletion {
+                    documents_ids,
+                    index_uid: task.index_uid.ok_or(Error::CorruptedDump)?,
+                },
+                KindDump::DocumentClear => KindWithContent::DocumentClear {
+                    index_uid: task.index_uid.ok_or(Error::CorruptedDump)?,
+                },
+                KindDump::Settings { settings, is_deletion, allow_index_creation } => {
+                    KindWithContent::SettingsUpdate {
+                        index_uid: task.index_uid.ok_or(Error::CorruptedDump)?,
+                        new_settings: settings,
+                        is_deletion,
+                        allow_index_creation,
+                    }
+                }
+                KindDump::IndexDeletion => KindWithContent::IndexDeletion {
+                    index_uid: task.index_uid.ok_or(Error::CorruptedDump)?,
+                },
+                KindDump::IndexCreation { primary_key } => KindWithContent::IndexCreation {
+                    index_uid: task.index_uid.ok_or(Error::CorruptedDump)?,
+                    primary_key,
+                },
+                KindDump::IndexUpdate { primary_key } => KindWithContent::IndexUpdate {
+                    index_uid: task.index_uid.ok_or(Error::CorruptedDump)?,
+                    primary_key,
+                },
+                KindDump::IndexSwap { swaps } => KindWithContent::IndexSwap { swaps },
+                KindDump::TaskCancelation { query, tasks } => {
+                    KindWithContent::TaskCancelation { query, tasks }
+                }
+                KindDump::TasksDeletion { query, tasks } => {
+                    KindWithContent::TaskDeletion { query, tasks }
+                }
+                KindDump::DumpCreation { keys, instance_uid } => {
+                    KindWithContent::DumpCreation { keys, instance_uid }
+                }
+                KindDump::SnapshotCreation => KindWithContent::SnapshotCreation,
+            },
+        };
+
+        self.index_scheduler.all_tasks.put(&mut self.wtxn, &BEU32::new(task.uid), &task)?;
+
+        for index in task.indexes() {
+            match self.indexes.get_mut(index) {
+                Some(bitmap) => {
+                    bitmap.insert(task.uid);
+                }
+                None => {
+                    let mut bitmap = RoaringBitmap::new();
+                    bitmap.insert(task.uid);
+                    self.indexes.insert(index.to_string(), bitmap);
+                }
+            };
+        }
+
+        utils::insert_task_datetime(
+            &mut self.wtxn,
+            self.index_scheduler.enqueued_at,
+            task.enqueued_at,
+            task.uid,
+        )?;
+
+        // we can't override the started_at & finished_at, so we must only set it if the tasks is finished and won't change
+        if matches!(task.status, Status::Succeeded | Status::Failed | Status::Canceled) {
+            if let Some(started_at) = task.started_at {
+                utils::insert_task_datetime(
+                    &mut self.wtxn,
+                    self.index_scheduler.started_at,
+                    started_at,
+                    task.uid,
+                )?;
+            }
+            if let Some(finished_at) = task.finished_at {
+                utils::insert_task_datetime(
+                    &mut self.wtxn,
+                    self.index_scheduler.finished_at,
+                    finished_at,
+                    task.uid,
+                )?;
+            }
+        }
+
+        self.statuses.entry(task.status).or_insert(RoaringBitmap::new()).insert(task.uid);
+        self.kinds.entry(task.kind.as_kind()).or_insert(RoaringBitmap::new()).insert(task.uid);
+
+        Ok(task)
+    }
+
+    /// Commit all the changes and exit the importing dump state
+    pub fn finish(mut self) -> Result<()> {
+        for (index, bitmap) in self.indexes {
+            self.index_scheduler.index_tasks.put(&mut self.wtxn, &index, &bitmap)?;
+        }
+        for (status, bitmap) in self.statuses {
+            self.index_scheduler.put_status(&mut self.wtxn, status, &bitmap)?;
+        }
+        for (kind, bitmap) in self.kinds {
+            self.index_scheduler.put_kind(&mut self.wtxn, kind, &bitmap)?;
+        }
+
+        self.wtxn.commit()?;
+        self.index_scheduler.wake_up.signal();
+
+        Ok(())
+    }
+}
+
 /// The outcome of calling the [`IndexScheduler::tick`] function.
 pub enum TickOutcome {
     /// The scheduler should immediately attempt another `tick`.
@@ -1238,6 +1324,17 @@ struct IndexBudget {
     task_db_size: usize,
 }
 
+/// The statistics that can be computed from an `Index` object and the scheduler.
+///
+/// Compared with `index_mapper::IndexStats`, it adds the scheduling status.
+#[derive(Debug)]
+pub struct IndexStats {
+    /// Whether this index is currently performing indexation, according to the scheduler.
+    pub is_indexing: bool,
+    /// Internal stats computed from the index.
+    pub inner_stats: index_mapper::IndexStats,
+}
+
 #[cfg(test)]
 mod tests {
     use std::io::{BufWriter, Seek, Write};
diff --git a/index-scheduler/src/snapshots/lib.rs/cancel_enqueued_task/cancel_processed.snap b/index-scheduler/src/snapshots/lib.rs/cancel_enqueued_task/cancel_processed.snap
index a06b82c74..077784965 100644
--- a/index-scheduler/src/snapshots/lib.rs/cancel_enqueued_task/cancel_processed.snap
+++ b/index-scheduler/src/snapshots/lib.rs/cancel_enqueued_task/cancel_processed.snap
@@ -1,6 +1,5 @@
 ---
 source: index-scheduler/src/lib.rs
-assertion_line: 1755
 ---
 ### Autobatching Enabled = true
 ### Processing Tasks:
@@ -23,7 +22,7 @@ canceled [0,]
 catto [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 1 [0,]
diff --git a/index-scheduler/src/snapshots/lib.rs/cancel_enqueued_task/initial_tasks_enqueued.snap b/index-scheduler/src/snapshots/lib.rs/cancel_enqueued_task/initial_tasks_enqueued.snap
index 743e74a14..3d3830b29 100644
--- a/index-scheduler/src/snapshots/lib.rs/cancel_enqueued_task/initial_tasks_enqueued.snap
+++ b/index-scheduler/src/snapshots/lib.rs/cancel_enqueued_task/initial_tasks_enqueued.snap
@@ -20,7 +20,7 @@ enqueued [0,1,]
 catto [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/cancel_mix_of_tasks/aborted_indexation.snap b/index-scheduler/src/snapshots/lib.rs/cancel_mix_of_tasks/aborted_indexation.snap
index 5c6078b51..112cd597b 100644
--- a/index-scheduler/src/snapshots/lib.rs/cancel_mix_of_tasks/aborted_indexation.snap
+++ b/index-scheduler/src/snapshots/lib.rs/cancel_mix_of_tasks/aborted_indexation.snap
@@ -25,7 +25,9 @@ catto [0,]
 wolfo [2,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["beavero", "catto"]
+beavero: { number_of_documents: 0, field_distribution: {} }
+catto: { number_of_documents: 1, field_distribution: {"id": 1} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/cancel_mix_of_tasks/cancel_processed.snap b/index-scheduler/src/snapshots/lib.rs/cancel_mix_of_tasks/cancel_processed.snap
index f67fff59f..1e5182f80 100644
--- a/index-scheduler/src/snapshots/lib.rs/cancel_mix_of_tasks/cancel_processed.snap
+++ b/index-scheduler/src/snapshots/lib.rs/cancel_mix_of_tasks/cancel_processed.snap
@@ -1,6 +1,5 @@
 ---
 source: index-scheduler/src/lib.rs
-assertion_line: 1859
 ---
 ### Autobatching Enabled = true
 ### Processing Tasks:
@@ -27,7 +26,9 @@ catto [0,]
 wolfo [2,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["beavero", "catto"]
+beavero: { number_of_documents: 0, field_distribution: {} }
+catto: { number_of_documents: 1, field_distribution: {"id": 1} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 3 [1,2,]
diff --git a/index-scheduler/src/snapshots/lib.rs/cancel_mix_of_tasks/first_task_processed.snap b/index-scheduler/src/snapshots/lib.rs/cancel_mix_of_tasks/first_task_processed.snap
index 36d34ff93..16be0e4d5 100644
--- a/index-scheduler/src/snapshots/lib.rs/cancel_mix_of_tasks/first_task_processed.snap
+++ b/index-scheduler/src/snapshots/lib.rs/cancel_mix_of_tasks/first_task_processed.snap
@@ -23,7 +23,8 @@ catto [0,]
 wolfo [2,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["catto"]
+catto: { number_of_documents: 1, field_distribution: {"id": 1} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/cancel_mix_of_tasks/processing_second_task_cancel_enqueued.snap b/index-scheduler/src/snapshots/lib.rs/cancel_mix_of_tasks/processing_second_task_cancel_enqueued.snap
index 30da295f9..46ccfcb8b 100644
--- a/index-scheduler/src/snapshots/lib.rs/cancel_mix_of_tasks/processing_second_task_cancel_enqueued.snap
+++ b/index-scheduler/src/snapshots/lib.rs/cancel_mix_of_tasks/processing_second_task_cancel_enqueued.snap
@@ -25,7 +25,8 @@ catto [0,]
 wolfo [2,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["catto"]
+catto: { number_of_documents: 1, field_distribution: {"id": 1} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/cancel_processing_task/aborted_indexation.snap b/index-scheduler/src/snapshots/lib.rs/cancel_processing_task/aborted_indexation.snap
index 6074673e3..a2187ab2b 100644
--- a/index-scheduler/src/snapshots/lib.rs/cancel_processing_task/aborted_indexation.snap
+++ b/index-scheduler/src/snapshots/lib.rs/cancel_processing_task/aborted_indexation.snap
@@ -20,7 +20,8 @@ enqueued [0,1,]
 catto [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["catto"]
+catto: { number_of_documents: 0, field_distribution: {} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/cancel_processing_task/cancel_processed.snap b/index-scheduler/src/snapshots/lib.rs/cancel_processing_task/cancel_processed.snap
index f2035c7fe..0ede1ffd3 100644
--- a/index-scheduler/src/snapshots/lib.rs/cancel_processing_task/cancel_processed.snap
+++ b/index-scheduler/src/snapshots/lib.rs/cancel_processing_task/cancel_processed.snap
@@ -1,6 +1,5 @@
 ---
 source: index-scheduler/src/lib.rs
-assertion_line: 1818
 ---
 ### Autobatching Enabled = true
 ### Processing Tasks:
@@ -23,7 +22,8 @@ canceled [0,]
 catto [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["catto"]
+catto: { number_of_documents: 0, field_distribution: {} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 1 [0,]
diff --git a/index-scheduler/src/snapshots/lib.rs/cancel_processing_task/cancel_task_registered.snap b/index-scheduler/src/snapshots/lib.rs/cancel_processing_task/cancel_task_registered.snap
index 061f334c8..f65b5ee67 100644
--- a/index-scheduler/src/snapshots/lib.rs/cancel_processing_task/cancel_task_registered.snap
+++ b/index-scheduler/src/snapshots/lib.rs/cancel_processing_task/cancel_task_registered.snap
@@ -20,7 +20,7 @@ enqueued [0,1,]
 catto [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/cancel_processing_task/initial_task_processing.snap b/index-scheduler/src/snapshots/lib.rs/cancel_processing_task/initial_task_processing.snap
index 905cec451..8a3ad4661 100644
--- a/index-scheduler/src/snapshots/lib.rs/cancel_processing_task/initial_task_processing.snap
+++ b/index-scheduler/src/snapshots/lib.rs/cancel_processing_task/initial_task_processing.snap
@@ -18,7 +18,7 @@ enqueued [0,]
 catto [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/cancel_processing_task/registered_the_first_task.snap b/index-scheduler/src/snapshots/lib.rs/cancel_processing_task/registered_the_first_task.snap
index d454b501e..6873f8b56 100644
--- a/index-scheduler/src/snapshots/lib.rs/cancel_processing_task/registered_the_first_task.snap
+++ b/index-scheduler/src/snapshots/lib.rs/cancel_processing_task/registered_the_first_task.snap
@@ -18,7 +18,7 @@ enqueued [0,]
 catto [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/cancel_succeeded_task/cancel_processed.snap b/index-scheduler/src/snapshots/lib.rs/cancel_succeeded_task/cancel_processed.snap
index b3842cc12..36e47f569 100644
--- a/index-scheduler/src/snapshots/lib.rs/cancel_succeeded_task/cancel_processed.snap
+++ b/index-scheduler/src/snapshots/lib.rs/cancel_succeeded_task/cancel_processed.snap
@@ -21,7 +21,8 @@ succeeded [0,1,]
 catto [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["catto"]
+catto: { number_of_documents: 1, field_distribution: {"id": 1} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 1 []
diff --git a/index-scheduler/src/snapshots/lib.rs/cancel_succeeded_task/initial_task_processed.snap b/index-scheduler/src/snapshots/lib.rs/cancel_succeeded_task/initial_task_processed.snap
index e52a80fae..028e03446 100644
--- a/index-scheduler/src/snapshots/lib.rs/cancel_succeeded_task/initial_task_processed.snap
+++ b/index-scheduler/src/snapshots/lib.rs/cancel_succeeded_task/initial_task_processed.snap
@@ -19,7 +19,8 @@ succeeded [0,]
 catto [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["catto"]
+catto: { number_of_documents: 1, field_distribution: {"id": 1} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/cancel_succeeded_task/registered_the_first_task.snap b/index-scheduler/src/snapshots/lib.rs/cancel_succeeded_task/registered_the_first_task.snap
index d454b501e..6873f8b56 100644
--- a/index-scheduler/src/snapshots/lib.rs/cancel_succeeded_task/registered_the_first_task.snap
+++ b/index-scheduler/src/snapshots/lib.rs/cancel_succeeded_task/registered_the_first_task.snap
@@ -18,7 +18,7 @@ enqueued [0,]
 catto [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/do_not_batch_task_of_different_indexes/all_tasks_processed.snap b/index-scheduler/src/snapshots/lib.rs/do_not_batch_task_of_different_indexes/all_tasks_processed.snap
index f9195857a..c9a12c327 100644
--- a/index-scheduler/src/snapshots/lib.rs/do_not_batch_task_of_different_indexes/all_tasks_processed.snap
+++ b/index-scheduler/src/snapshots/lib.rs/do_not_batch_task_of_different_indexes/all_tasks_processed.snap
@@ -27,7 +27,10 @@ doggos [0,3,]
 girafos [2,5,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["cattos", "doggos", "girafos"]
+cattos: { number_of_documents: 0, field_distribution: {} }
+doggos: { number_of_documents: 0, field_distribution: {} }
+girafos: { number_of_documents: 0, field_distribution: {} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/document_addition/after_register.snap b/index-scheduler/src/snapshots/lib.rs/document_addition/after_register.snap
index 3e654a0e2..c1869a475 100644
--- a/index-scheduler/src/snapshots/lib.rs/document_addition/after_register.snap
+++ b/index-scheduler/src/snapshots/lib.rs/document_addition/after_register.snap
@@ -18,7 +18,7 @@ enqueued [0,]
 doggos [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/document_addition/after_the_batch_creation.snap b/index-scheduler/src/snapshots/lib.rs/document_addition/after_the_batch_creation.snap
index 10291b206..33d58eab6 100644
--- a/index-scheduler/src/snapshots/lib.rs/document_addition/after_the_batch_creation.snap
+++ b/index-scheduler/src/snapshots/lib.rs/document_addition/after_the_batch_creation.snap
@@ -18,7 +18,7 @@ enqueued [0,]
 doggos [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/document_addition/once_everything_is_processed.snap b/index-scheduler/src/snapshots/lib.rs/document_addition/once_everything_is_processed.snap
index 6079a4317..b4a6da3af 100644
--- a/index-scheduler/src/snapshots/lib.rs/document_addition/once_everything_is_processed.snap
+++ b/index-scheduler/src/snapshots/lib.rs/document_addition/once_everything_is_processed.snap
@@ -19,7 +19,8 @@ succeeded [0,]
 doggos [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 1, field_distribution: {"doggo": 1, "id": 1} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/document_addition_and_document_deletion/after_processing_the_batch.snap b/index-scheduler/src/snapshots/lib.rs/document_addition_and_document_deletion/after_processing_the_batch.snap
index f70496b81..b27288a0f 100644
--- a/index-scheduler/src/snapshots/lib.rs/document_addition_and_document_deletion/after_processing_the_batch.snap
+++ b/index-scheduler/src/snapshots/lib.rs/document_addition_and_document_deletion/after_processing_the_batch.snap
@@ -21,7 +21,8 @@ succeeded [0,1,]
 doggos [0,1,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 1, field_distribution: {"doggo": 1, "id": 1} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/document_addition_and_document_deletion/registered_the_first_task.snap b/index-scheduler/src/snapshots/lib.rs/document_addition_and_document_deletion/registered_the_first_task.snap
index 35dc0b41a..d26e62bff 100644
--- a/index-scheduler/src/snapshots/lib.rs/document_addition_and_document_deletion/registered_the_first_task.snap
+++ b/index-scheduler/src/snapshots/lib.rs/document_addition_and_document_deletion/registered_the_first_task.snap
@@ -18,7 +18,7 @@ enqueued [0,]
 doggos [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/document_addition_and_document_deletion/registered_the_second_task.snap b/index-scheduler/src/snapshots/lib.rs/document_addition_and_document_deletion/registered_the_second_task.snap
index bd65a6d99..e0f371120 100644
--- a/index-scheduler/src/snapshots/lib.rs/document_addition_and_document_deletion/registered_the_second_task.snap
+++ b/index-scheduler/src/snapshots/lib.rs/document_addition_and_document_deletion/registered_the_second_task.snap
@@ -20,7 +20,7 @@ enqueued [0,1,]
 doggos [0,1,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion/before_index_creation.snap b/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion/before_index_creation.snap
index 379e90120..97ba419a8 100644
--- a/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion/before_index_creation.snap
+++ b/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion/before_index_creation.snap
@@ -23,7 +23,8 @@ succeeded [0,]
 doggos [0,1,2,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 0, field_distribution: {} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion/both_task_succeeded.snap b/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion/both_task_succeeded.snap
index 2ff82bfd2..fd96ee974 100644
--- a/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion/both_task_succeeded.snap
+++ b/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion/both_task_succeeded.snap
@@ -23,7 +23,7 @@ succeeded [0,1,2,]
 doggos [0,1,2,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion/registered_the_first_task.snap b/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion/registered_the_first_task.snap
index e23cd648f..1a29c1ac6 100644
--- a/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion/registered_the_first_task.snap
+++ b/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion/registered_the_first_task.snap
@@ -18,7 +18,7 @@ enqueued [0,]
 doggos [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion/registered_the_second_task.snap b/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion/registered_the_second_task.snap
index 86674ccd0..68ded1f0d 100644
--- a/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion/registered_the_second_task.snap
+++ b/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion/registered_the_second_task.snap
@@ -20,7 +20,7 @@ enqueued [0,1,]
 doggos [0,1,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion/registered_the_third_task.snap b/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion/registered_the_third_task.snap
index f4d3a8190..1601a6b25 100644
--- a/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion/registered_the_third_task.snap
+++ b/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion/registered_the_third_task.snap
@@ -22,7 +22,7 @@ enqueued [0,1,2,]
 doggos [0,1,2,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion_on_unexisting_index/1.snap b/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion_on_unexisting_index/1.snap
index e0813f109..c200ce402 100644
--- a/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion_on_unexisting_index/1.snap
+++ b/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion_on_unexisting_index/1.snap
@@ -20,7 +20,7 @@ enqueued [0,1,]
 doggos [0,1,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion_on_unexisting_index/2.snap b/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion_on_unexisting_index/2.snap
index f8586b7b8..7884dfe08 100644
--- a/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion_on_unexisting_index/2.snap
+++ b/index-scheduler/src/snapshots/lib.rs/document_addition_and_index_deletion_on_unexisting_index/2.snap
@@ -21,7 +21,7 @@ succeeded [0,1,]
 doggos [0,1,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/document_deletion_and_document_addition/after_failing_the_deletion.snap b/index-scheduler/src/snapshots/lib.rs/document_deletion_and_document_addition/after_failing_the_deletion.snap
index 2850af744..1d4aa24e2 100644
--- a/index-scheduler/src/snapshots/lib.rs/document_deletion_and_document_addition/after_failing_the_deletion.snap
+++ b/index-scheduler/src/snapshots/lib.rs/document_deletion_and_document_addition/after_failing_the_deletion.snap
@@ -21,7 +21,7 @@ failed [0,]
 doggos [0,1,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/document_deletion_and_document_addition/after_last_successful_addition.snap b/index-scheduler/src/snapshots/lib.rs/document_deletion_and_document_addition/after_last_successful_addition.snap
index 59e18bdb0..0f9dfd3e6 100644
--- a/index-scheduler/src/snapshots/lib.rs/document_deletion_and_document_addition/after_last_successful_addition.snap
+++ b/index-scheduler/src/snapshots/lib.rs/document_deletion_and_document_addition/after_last_successful_addition.snap
@@ -22,7 +22,8 @@ failed [0,]
 doggos [0,1,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 3, field_distribution: {"catto": 1, "doggo": 2, "id": 3} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/document_deletion_and_document_addition/registered_the_first_task.snap b/index-scheduler/src/snapshots/lib.rs/document_deletion_and_document_addition/registered_the_first_task.snap
index 9356e6dba..5753db7e6 100644
--- a/index-scheduler/src/snapshots/lib.rs/document_deletion_and_document_addition/registered_the_first_task.snap
+++ b/index-scheduler/src/snapshots/lib.rs/document_deletion_and_document_addition/registered_the_first_task.snap
@@ -18,7 +18,7 @@ enqueued [0,]
 doggos [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/document_deletion_and_document_addition/registered_the_second_task.snap b/index-scheduler/src/snapshots/lib.rs/document_deletion_and_document_addition/registered_the_second_task.snap
index 89e341184..0b6191f9e 100644
--- a/index-scheduler/src/snapshots/lib.rs/document_deletion_and_document_addition/registered_the_second_task.snap
+++ b/index-scheduler/src/snapshots/lib.rs/document_deletion_and_document_addition/registered_the_second_task.snap
@@ -20,7 +20,7 @@ enqueued [0,1,]
 doggos [0,1,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_addition/document_addition_batch_created.snap b/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_addition/document_addition_batch_created.snap
index 10291b206..33d58eab6 100644
--- a/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_addition/document_addition_batch_created.snap
+++ b/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_addition/document_addition_batch_created.snap
@@ -18,7 +18,7 @@ enqueued [0,]
 doggos [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_addition/document_addition_failed.snap b/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_addition/document_addition_failed.snap
index c1bfd7db9..18edc3613 100644
--- a/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_addition/document_addition_failed.snap
+++ b/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_addition/document_addition_failed.snap
@@ -19,7 +19,7 @@ failed [0,]
 doggos [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_addition/registered_the_first_task.snap b/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_addition/registered_the_first_task.snap
index 3e654a0e2..c1869a475 100644
--- a/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_addition/registered_the_first_task.snap
+++ b/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_document_addition/registered_the_first_task.snap
@@ -18,7 +18,7 @@ enqueued [0,]
 doggos [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_index_creation/after_register.snap b/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_index_creation/after_register.snap
index 63a2d606e..f252cc8ef 100644
--- a/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_index_creation/after_register.snap
+++ b/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_index_creation/after_register.snap
@@ -18,7 +18,7 @@ enqueued [0,]
 catto [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_index_creation/index_creation_failed.snap b/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_index_creation/index_creation_failed.snap
index 252ae082e..d2b06a4f4 100644
--- a/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_index_creation/index_creation_failed.snap
+++ b/index-scheduler/src/snapshots/lib.rs/fail_in_process_batch_for_index_creation/index_creation_failed.snap
@@ -19,7 +19,7 @@ failed [0,]
 catto [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/fail_in_update_task_after_process_batch_success_for_document_addition/after_batch_succeeded.snap b/index-scheduler/src/snapshots/lib.rs/fail_in_update_task_after_process_batch_success_for_document_addition/after_batch_succeeded.snap
index bdda4e086..9c31fd318 100644
--- a/index-scheduler/src/snapshots/lib.rs/fail_in_update_task_after_process_batch_success_for_document_addition/after_batch_succeeded.snap
+++ b/index-scheduler/src/snapshots/lib.rs/fail_in_update_task_after_process_batch_success_for_document_addition/after_batch_succeeded.snap
@@ -18,7 +18,8 @@ enqueued [0,]
 doggos [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 1, field_distribution: {"doggo": 1, "id": 1} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/fail_in_update_task_after_process_batch_success_for_document_addition/after_failing_to_commit.snap b/index-scheduler/src/snapshots/lib.rs/fail_in_update_task_after_process_batch_success_for_document_addition/after_failing_to_commit.snap
index bdda4e086..9c31fd318 100644
--- a/index-scheduler/src/snapshots/lib.rs/fail_in_update_task_after_process_batch_success_for_document_addition/after_failing_to_commit.snap
+++ b/index-scheduler/src/snapshots/lib.rs/fail_in_update_task_after_process_batch_success_for_document_addition/after_failing_to_commit.snap
@@ -18,7 +18,8 @@ enqueued [0,]
 doggos [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 1, field_distribution: {"doggo": 1, "id": 1} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/fail_in_update_task_after_process_batch_success_for_document_addition/document_addition_succeeded_but_index_scheduler_not_updated.snap b/index-scheduler/src/snapshots/lib.rs/fail_in_update_task_after_process_batch_success_for_document_addition/document_addition_succeeded_but_index_scheduler_not_updated.snap
index 3e654a0e2..c1869a475 100644
--- a/index-scheduler/src/snapshots/lib.rs/fail_in_update_task_after_process_batch_success_for_document_addition/document_addition_succeeded_but_index_scheduler_not_updated.snap
+++ b/index-scheduler/src/snapshots/lib.rs/fail_in_update_task_after_process_batch_success_for_document_addition/document_addition_succeeded_but_index_scheduler_not_updated.snap
@@ -18,7 +18,7 @@ enqueued [0,]
 doggos [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/fail_in_update_task_after_process_batch_success_for_document_addition/registered_the_first_task.snap b/index-scheduler/src/snapshots/lib.rs/fail_in_update_task_after_process_batch_success_for_document_addition/registered_the_first_task.snap
index 3e654a0e2..c1869a475 100644
--- a/index-scheduler/src/snapshots/lib.rs/fail_in_update_task_after_process_batch_success_for_document_addition/registered_the_first_task.snap
+++ b/index-scheduler/src/snapshots/lib.rs/fail_in_update_task_after_process_batch_success_for_document_addition/registered_the_first_task.snap
@@ -18,7 +18,7 @@ enqueued [0,]
 doggos [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/fail_in_update_task_after_process_batch_success_for_document_addition/task_successfully_processed.snap b/index-scheduler/src/snapshots/lib.rs/fail_in_update_task_after_process_batch_success_for_document_addition/task_successfully_processed.snap
index 6079a4317..b4a6da3af 100644
--- a/index-scheduler/src/snapshots/lib.rs/fail_in_update_task_after_process_batch_success_for_document_addition/task_successfully_processed.snap
+++ b/index-scheduler/src/snapshots/lib.rs/fail_in_update_task_after_process_batch_success_for_document_addition/task_successfully_processed.snap
@@ -19,7 +19,8 @@ succeeded [0,]
 doggos [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 1, field_distribution: {"doggo": 1, "id": 1} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/insert_task_while_another_task_is_processing/after_batch_creation.snap b/index-scheduler/src/snapshots/lib.rs/insert_task_while_another_task_is_processing/after_batch_creation.snap
index c75a3b87e..3f34ca57b 100644
--- a/index-scheduler/src/snapshots/lib.rs/insert_task_while_another_task_is_processing/after_batch_creation.snap
+++ b/index-scheduler/src/snapshots/lib.rs/insert_task_while_another_task_is_processing/after_batch_creation.snap
@@ -18,7 +18,7 @@ enqueued [0,]
 index_a [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/insert_task_while_another_task_is_processing/registered_the_first_task.snap b/index-scheduler/src/snapshots/lib.rs/insert_task_while_another_task_is_processing/registered_the_first_task.snap
index 656b06ad3..f17bfe38f 100644
--- a/index-scheduler/src/snapshots/lib.rs/insert_task_while_another_task_is_processing/registered_the_first_task.snap
+++ b/index-scheduler/src/snapshots/lib.rs/insert_task_while_another_task_is_processing/registered_the_first_task.snap
@@ -18,7 +18,7 @@ enqueued [0,]
 index_a [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/insert_task_while_another_task_is_processing/registered_the_second_task.snap b/index-scheduler/src/snapshots/lib.rs/insert_task_while_another_task_is_processing/registered_the_second_task.snap
index 0cf82317b..75d5d8760 100644
--- a/index-scheduler/src/snapshots/lib.rs/insert_task_while_another_task_is_processing/registered_the_second_task.snap
+++ b/index-scheduler/src/snapshots/lib.rs/insert_task_while_another_task_is_processing/registered_the_second_task.snap
@@ -20,7 +20,7 @@ index_a [0,]
 index_b [1,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/insert_task_while_another_task_is_processing/registered_the_third_task.snap b/index-scheduler/src/snapshots/lib.rs/insert_task_while_another_task_is_processing/registered_the_third_task.snap
index 8b73d12c2..a69818dfa 100644
--- a/index-scheduler/src/snapshots/lib.rs/insert_task_while_another_task_is_processing/registered_the_third_task.snap
+++ b/index-scheduler/src/snapshots/lib.rs/insert_task_while_another_task_is_processing/registered_the_third_task.snap
@@ -22,7 +22,7 @@ index_a [0,2,]
 index_b [1,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/panic_in_process_batch_for_index_creation/index_creation_failed.snap b/index-scheduler/src/snapshots/lib.rs/panic_in_process_batch_for_index_creation/index_creation_failed.snap
index 60d8c4cdb..9100e5075 100644
--- a/index-scheduler/src/snapshots/lib.rs/panic_in_process_batch_for_index_creation/index_creation_failed.snap
+++ b/index-scheduler/src/snapshots/lib.rs/panic_in_process_batch_for_index_creation/index_creation_failed.snap
@@ -19,7 +19,7 @@ failed [0,]
 catto [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/panic_in_process_batch_for_index_creation/registered_the_first_task.snap b/index-scheduler/src/snapshots/lib.rs/panic_in_process_batch_for_index_creation/registered_the_first_task.snap
index 63a2d606e..f252cc8ef 100644
--- a/index-scheduler/src/snapshots/lib.rs/panic_in_process_batch_for_index_creation/registered_the_first_task.snap
+++ b/index-scheduler/src/snapshots/lib.rs/panic_in_process_batch_for_index_creation/registered_the_first_task.snap
@@ -18,7 +18,7 @@ enqueued [0,]
 catto [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/processed_the_first_task.snap b/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/processed_the_first_task.snap
index 3a4705635..a34531f2a 100644
--- a/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/processed_the_first_task.snap
+++ b/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/processed_the_first_task.snap
@@ -23,7 +23,8 @@ cattos [1,]
 doggos [0,2,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 0, field_distribution: {} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/processed_the_second_task.snap b/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/processed_the_second_task.snap
index 979ec8af6..f163ee3d7 100644
--- a/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/processed_the_second_task.snap
+++ b/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/processed_the_second_task.snap
@@ -23,7 +23,9 @@ cattos [1,]
 doggos [0,2,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["cattos", "doggos"]
+cattos: { number_of_documents: 0, field_distribution: {} }
+doggos: { number_of_documents: 0, field_distribution: {} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/processed_the_third_task.snap b/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/processed_the_third_task.snap
index c7190dd8b..7e8db762f 100644
--- a/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/processed_the_third_task.snap
+++ b/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/processed_the_third_task.snap
@@ -23,7 +23,8 @@ cattos [1,]
 doggos [0,2,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["cattos"]
+cattos: { number_of_documents: 0, field_distribution: {} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/registered_the_first_task.snap b/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/registered_the_first_task.snap
index e23cd648f..1a29c1ac6 100644
--- a/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/registered_the_first_task.snap
+++ b/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/registered_the_first_task.snap
@@ -18,7 +18,7 @@ enqueued [0,]
 doggos [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/registered_the_second_task.snap b/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/registered_the_second_task.snap
index 82cc517cb..4020c2db0 100644
--- a/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/registered_the_second_task.snap
+++ b/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/registered_the_second_task.snap
@@ -20,7 +20,7 @@ cattos [1,]
 doggos [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/registered_the_third_task.snap b/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/registered_the_third_task.snap
index 76a6b3f08..f25280bc1 100644
--- a/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/registered_the_third_task.snap
+++ b/index-scheduler/src/snapshots/lib.rs/process_tasks_inserted_without_new_signal/registered_the_third_task.snap
@@ -22,7 +22,7 @@ cattos [1,]
 doggos [0,2,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/first.snap b/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/first.snap
index fa09eba28..d67c659c6 100644
--- a/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/first.snap
+++ b/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/first.snap
@@ -23,7 +23,8 @@ succeeded [0,]
 doggos [0,1,2,3,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 0, field_distribution: {} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/fourth.snap b/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/fourth.snap
index e52c36718..3d5c28e2c 100644
--- a/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/fourth.snap
+++ b/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/fourth.snap
@@ -23,7 +23,8 @@ succeeded [0,1,2,3,]
 doggos [0,1,2,3,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 0, field_distribution: {} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/registered_the_first_task.snap b/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/registered_the_first_task.snap
index 52866bed6..c2ad519fa 100644
--- a/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/registered_the_first_task.snap
+++ b/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/registered_the_first_task.snap
@@ -18,7 +18,7 @@ enqueued [0,]
 doggos [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/registered_the_fourth_task.snap b/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/registered_the_fourth_task.snap
index 6ac8aa79f..a9eb16d21 100644
--- a/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/registered_the_fourth_task.snap
+++ b/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/registered_the_fourth_task.snap
@@ -22,7 +22,7 @@ enqueued [0,1,2,3,]
 doggos [0,1,2,3,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/registered_the_second_task.snap b/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/registered_the_second_task.snap
index 32d32daaf..ad269dd7a 100644
--- a/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/registered_the_second_task.snap
+++ b/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/registered_the_second_task.snap
@@ -20,7 +20,7 @@ enqueued [0,1,]
 doggos [0,1,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/registered_the_third_task.snap b/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/registered_the_third_task.snap
index 75ceef14d..6267a840f 100644
--- a/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/registered_the_third_task.snap
+++ b/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/registered_the_third_task.snap
@@ -21,7 +21,7 @@ enqueued [0,1,2,]
 doggos [0,1,2,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/second.snap b/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/second.snap
index 4b1577aa6..d45867c49 100644
--- a/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/second.snap
+++ b/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/second.snap
@@ -23,7 +23,8 @@ succeeded [0,1,]
 doggos [0,1,2,3,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 0, field_distribution: {} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/third.snap b/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/third.snap
index 2ac3b141f..9705c5321 100644
--- a/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/third.snap
+++ b/index-scheduler/src/snapshots/lib.rs/process_tasks_without_autobatching/third.snap
@@ -23,7 +23,8 @@ succeeded [0,1,2,]
 doggos [0,1,2,3,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 0, field_distribution: {} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/query_tasks_canceled_by/start.snap b/index-scheduler/src/snapshots/lib.rs/query_tasks_canceled_by/start.snap
index 624606ba9..b05f05d5d 100644
--- a/index-scheduler/src/snapshots/lib.rs/query_tasks_canceled_by/start.snap
+++ b/index-scheduler/src/snapshots/lib.rs/query_tasks_canceled_by/start.snap
@@ -26,7 +26,8 @@ catto [0,2,]
 doggo [1,2,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["catto"]
+catto: { number_of_documents: 0, field_distribution: {} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 3 [1,2,]
diff --git a/index-scheduler/src/snapshots/lib.rs/query_tasks_from_and_limit/processed_all_tasks.snap b/index-scheduler/src/snapshots/lib.rs/query_tasks_from_and_limit/processed_all_tasks.snap
index 694bbff26..a07c46427 100644
--- a/index-scheduler/src/snapshots/lib.rs/query_tasks_from_and_limit/processed_all_tasks.snap
+++ b/index-scheduler/src/snapshots/lib.rs/query_tasks_from_and_limit/processed_all_tasks.snap
@@ -23,7 +23,10 @@ doggo [0,]
 whalo [1,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["catto", "doggo", "whalo"]
+catto: { number_of_documents: 0, field_distribution: {} }
+doggo: { number_of_documents: 0, field_distribution: {} }
+whalo: { number_of_documents: 0, field_distribution: {} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/query_tasks_from_and_limit/registered_the_first_task.snap b/index-scheduler/src/snapshots/lib.rs/query_tasks_from_and_limit/registered_the_first_task.snap
index c1a0899cd..8eb784c9b 100644
--- a/index-scheduler/src/snapshots/lib.rs/query_tasks_from_and_limit/registered_the_first_task.snap
+++ b/index-scheduler/src/snapshots/lib.rs/query_tasks_from_and_limit/registered_the_first_task.snap
@@ -18,7 +18,7 @@ enqueued [0,]
 doggo [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/query_tasks_from_and_limit/registered_the_second_task.snap b/index-scheduler/src/snapshots/lib.rs/query_tasks_from_and_limit/registered_the_second_task.snap
index 6daa6bce2..776d699e1 100644
--- a/index-scheduler/src/snapshots/lib.rs/query_tasks_from_and_limit/registered_the_second_task.snap
+++ b/index-scheduler/src/snapshots/lib.rs/query_tasks_from_and_limit/registered_the_second_task.snap
@@ -20,7 +20,7 @@ doggo [0,]
 whalo [1,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/query_tasks_from_and_limit/registered_the_third_task.snap b/index-scheduler/src/snapshots/lib.rs/query_tasks_from_and_limit/registered_the_third_task.snap
index 8427679e7..1a3fc5b53 100644
--- a/index-scheduler/src/snapshots/lib.rs/query_tasks_from_and_limit/registered_the_third_task.snap
+++ b/index-scheduler/src/snapshots/lib.rs/query_tasks_from_and_limit/registered_the_third_task.snap
@@ -22,7 +22,7 @@ doggo [0,]
 whalo [1,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/query_tasks_simple/end.snap b/index-scheduler/src/snapshots/lib.rs/query_tasks_simple/end.snap
index 65838db64..fe3b1eed4 100644
--- a/index-scheduler/src/snapshots/lib.rs/query_tasks_simple/end.snap
+++ b/index-scheduler/src/snapshots/lib.rs/query_tasks_simple/end.snap
@@ -24,7 +24,9 @@ doggo [1,]
 whalo [2,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["catto", "doggo"]
+catto: { number_of_documents: 0, field_distribution: {} }
+doggo: { number_of_documents: 0, field_distribution: {} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/query_tasks_simple/start.snap b/index-scheduler/src/snapshots/lib.rs/query_tasks_simple/start.snap
index aed5aed8c..1fa3fa1ab 100644
--- a/index-scheduler/src/snapshots/lib.rs/query_tasks_simple/start.snap
+++ b/index-scheduler/src/snapshots/lib.rs/query_tasks_simple/start.snap
@@ -22,7 +22,7 @@ doggo [1,]
 whalo [2,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/query_tasks_special_rules/start.snap b/index-scheduler/src/snapshots/lib.rs/query_tasks_special_rules/start.snap
index 2bb4f7590..4baa9d87a 100644
--- a/index-scheduler/src/snapshots/lib.rs/query_tasks_special_rules/start.snap
+++ b/index-scheduler/src/snapshots/lib.rs/query_tasks_special_rules/start.snap
@@ -24,7 +24,7 @@ doggo [1,2,]
 whalo [3,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/register/everything_is_succesfully_registered.snap b/index-scheduler/src/snapshots/lib.rs/register/everything_is_succesfully_registered.snap
index 360752bc6..62796a929 100644
--- a/index-scheduler/src/snapshots/lib.rs/register/everything_is_succesfully_registered.snap
+++ b/index-scheduler/src/snapshots/lib.rs/register/everything_is_succesfully_registered.snap
@@ -23,7 +23,7 @@ catto [0,1,2,]
 doggo [3,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/swap_indexes/create_a.snap b/index-scheduler/src/snapshots/lib.rs/swap_indexes/create_a.snap
index 2c009ef1a..47a6dc6a7 100644
--- a/index-scheduler/src/snapshots/lib.rs/swap_indexes/create_a.snap
+++ b/index-scheduler/src/snapshots/lib.rs/swap_indexes/create_a.snap
@@ -25,7 +25,8 @@ c [2,]
 d [3,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["a"]
+a: { number_of_documents: 0, field_distribution: {} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/swap_indexes/create_b.snap b/index-scheduler/src/snapshots/lib.rs/swap_indexes/create_b.snap
index 6d6e89c5f..13b783feb 100644
--- a/index-scheduler/src/snapshots/lib.rs/swap_indexes/create_b.snap
+++ b/index-scheduler/src/snapshots/lib.rs/swap_indexes/create_b.snap
@@ -25,7 +25,9 @@ c [2,]
 d [3,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["a", "b"]
+a: { number_of_documents: 0, field_distribution: {} }
+b: { number_of_documents: 0, field_distribution: {} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/swap_indexes/create_c.snap b/index-scheduler/src/snapshots/lib.rs/swap_indexes/create_c.snap
index c12334ecf..6b4bdb756 100644
--- a/index-scheduler/src/snapshots/lib.rs/swap_indexes/create_c.snap
+++ b/index-scheduler/src/snapshots/lib.rs/swap_indexes/create_c.snap
@@ -25,7 +25,10 @@ c [2,]
 d [3,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["a", "b", "c"]
+a: { number_of_documents: 0, field_distribution: {} }
+b: { number_of_documents: 0, field_distribution: {} }
+c: { number_of_documents: 0, field_distribution: {} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/swap_indexes/create_d.snap b/index-scheduler/src/snapshots/lib.rs/swap_indexes/create_d.snap
index b20b3b320..038903c59 100644
--- a/index-scheduler/src/snapshots/lib.rs/swap_indexes/create_d.snap
+++ b/index-scheduler/src/snapshots/lib.rs/swap_indexes/create_d.snap
@@ -25,7 +25,11 @@ c [2,]
 d [3,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["a", "b", "c", "d"]
+a: { number_of_documents: 0, field_distribution: {} }
+b: { number_of_documents: 0, field_distribution: {} }
+c: { number_of_documents: 0, field_distribution: {} }
+d: { number_of_documents: 0, field_distribution: {} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/swap_indexes/first_swap_processed.snap b/index-scheduler/src/snapshots/lib.rs/swap_indexes/first_swap_processed.snap
index 17e8936f0..c7ab30a36 100644
--- a/index-scheduler/src/snapshots/lib.rs/swap_indexes/first_swap_processed.snap
+++ b/index-scheduler/src/snapshots/lib.rs/swap_indexes/first_swap_processed.snap
@@ -28,7 +28,11 @@ c [3,4,5,]
 d [2,4,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["a", "b", "c", "d"]
+a: { number_of_documents: 0, field_distribution: {} }
+b: { number_of_documents: 0, field_distribution: {} }
+c: { number_of_documents: 0, field_distribution: {} }
+d: { number_of_documents: 0, field_distribution: {} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/swap_indexes/first_swap_registered.snap b/index-scheduler/src/snapshots/lib.rs/swap_indexes/first_swap_registered.snap
index f2c74f676..c0727d6e9 100644
--- a/index-scheduler/src/snapshots/lib.rs/swap_indexes/first_swap_registered.snap
+++ b/index-scheduler/src/snapshots/lib.rs/swap_indexes/first_swap_registered.snap
@@ -27,7 +27,11 @@ c [2,4,]
 d [3,4,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["a", "b", "c", "d"]
+a: { number_of_documents: 0, field_distribution: {} }
+b: { number_of_documents: 0, field_distribution: {} }
+c: { number_of_documents: 0, field_distribution: {} }
+d: { number_of_documents: 0, field_distribution: {} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/swap_indexes/second_swap_processed.snap b/index-scheduler/src/snapshots/lib.rs/swap_indexes/second_swap_processed.snap
index acfbc4c77..07acbe474 100644
--- a/index-scheduler/src/snapshots/lib.rs/swap_indexes/second_swap_processed.snap
+++ b/index-scheduler/src/snapshots/lib.rs/swap_indexes/second_swap_processed.snap
@@ -28,7 +28,11 @@ c [1,4,5,]
 d [2,4,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["a", "b", "c", "d"]
+a: { number_of_documents: 0, field_distribution: {} }
+b: { number_of_documents: 0, field_distribution: {} }
+c: { number_of_documents: 0, field_distribution: {} }
+d: { number_of_documents: 0, field_distribution: {} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/swap_indexes/third_empty_swap_processed.snap b/index-scheduler/src/snapshots/lib.rs/swap_indexes/third_empty_swap_processed.snap
index c7c6faae6..aeeba29f8 100644
--- a/index-scheduler/src/snapshots/lib.rs/swap_indexes/third_empty_swap_processed.snap
+++ b/index-scheduler/src/snapshots/lib.rs/swap_indexes/third_empty_swap_processed.snap
@@ -29,7 +29,11 @@ c [1,4,5,]
 d [2,4,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["a", "b", "c", "d"]
+a: { number_of_documents: 0, field_distribution: {} }
+b: { number_of_documents: 0, field_distribution: {} }
+c: { number_of_documents: 0, field_distribution: {} }
+d: { number_of_documents: 0, field_distribution: {} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/swap_indexes/two_swaps_registered.snap b/index-scheduler/src/snapshots/lib.rs/swap_indexes/two_swaps_registered.snap
index 0f8355f25..d1847fed1 100644
--- a/index-scheduler/src/snapshots/lib.rs/swap_indexes/two_swaps_registered.snap
+++ b/index-scheduler/src/snapshots/lib.rs/swap_indexes/two_swaps_registered.snap
@@ -28,7 +28,11 @@ c [2,4,5,]
 d [3,4,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["a", "b", "c", "d"]
+a: { number_of_documents: 0, field_distribution: {} }
+b: { number_of_documents: 0, field_distribution: {} }
+c: { number_of_documents: 0, field_distribution: {} }
+d: { number_of_documents: 0, field_distribution: {} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/swap_indexes_errors/after_the_index_creation.snap b/index-scheduler/src/snapshots/lib.rs/swap_indexes_errors/after_the_index_creation.snap
index b20b3b320..038903c59 100644
--- a/index-scheduler/src/snapshots/lib.rs/swap_indexes_errors/after_the_index_creation.snap
+++ b/index-scheduler/src/snapshots/lib.rs/swap_indexes_errors/after_the_index_creation.snap
@@ -25,7 +25,11 @@ c [2,]
 d [3,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["a", "b", "c", "d"]
+a: { number_of_documents: 0, field_distribution: {} }
+b: { number_of_documents: 0, field_distribution: {} }
+c: { number_of_documents: 0, field_distribution: {} }
+d: { number_of_documents: 0, field_distribution: {} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/swap_indexes_errors/first_swap_failed.snap b/index-scheduler/src/snapshots/lib.rs/swap_indexes_errors/first_swap_failed.snap
index fd9790835..4632820f0 100644
--- a/index-scheduler/src/snapshots/lib.rs/swap_indexes_errors/first_swap_failed.snap
+++ b/index-scheduler/src/snapshots/lib.rs/swap_indexes_errors/first_swap_failed.snap
@@ -30,7 +30,11 @@ e [4,]
 f [4,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["a", "b", "c", "d"]
+a: { number_of_documents: 0, field_distribution: {} }
+b: { number_of_documents: 0, field_distribution: {} }
+c: { number_of_documents: 0, field_distribution: {} }
+d: { number_of_documents: 0, field_distribution: {} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/swap_indexes_errors/initial_tasks_processed.snap b/index-scheduler/src/snapshots/lib.rs/swap_indexes_errors/initial_tasks_processed.snap
index b20b3b320..038903c59 100644
--- a/index-scheduler/src/snapshots/lib.rs/swap_indexes_errors/initial_tasks_processed.snap
+++ b/index-scheduler/src/snapshots/lib.rs/swap_indexes_errors/initial_tasks_processed.snap
@@ -25,7 +25,11 @@ c [2,]
 d [3,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["a", "b", "c", "d"]
+a: { number_of_documents: 0, field_distribution: {} }
+b: { number_of_documents: 0, field_distribution: {} }
+c: { number_of_documents: 0, field_distribution: {} }
+d: { number_of_documents: 0, field_distribution: {} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/task_deletion_delete_same_task_twice/initial_tasks_enqueued.snap b/index-scheduler/src/snapshots/lib.rs/task_deletion_delete_same_task_twice/initial_tasks_enqueued.snap
index fc37dcf2d..4b4a50bfb 100644
--- a/index-scheduler/src/snapshots/lib.rs/task_deletion_delete_same_task_twice/initial_tasks_enqueued.snap
+++ b/index-scheduler/src/snapshots/lib.rs/task_deletion_delete_same_task_twice/initial_tasks_enqueued.snap
@@ -20,7 +20,7 @@ catto [0,]
 doggo [1,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/task_deletion_delete_same_task_twice/initial_tasks_processed.snap b/index-scheduler/src/snapshots/lib.rs/task_deletion_delete_same_task_twice/initial_tasks_processed.snap
index e4c4d9d7e..6e3a6e8ed 100644
--- a/index-scheduler/src/snapshots/lib.rs/task_deletion_delete_same_task_twice/initial_tasks_processed.snap
+++ b/index-scheduler/src/snapshots/lib.rs/task_deletion_delete_same_task_twice/initial_tasks_processed.snap
@@ -21,7 +21,8 @@ catto [0,]
 doggo [1,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["catto"]
+catto: { number_of_documents: 1, field_distribution: {"id": 1} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/task_deletion_delete_same_task_twice/task_deletion_processed.snap b/index-scheduler/src/snapshots/lib.rs/task_deletion_delete_same_task_twice/task_deletion_processed.snap
index 8874cc9e0..c47a7a95f 100644
--- a/index-scheduler/src/snapshots/lib.rs/task_deletion_delete_same_task_twice/task_deletion_processed.snap
+++ b/index-scheduler/src/snapshots/lib.rs/task_deletion_delete_same_task_twice/task_deletion_processed.snap
@@ -22,7 +22,8 @@ succeeded [2,3,]
 doggo [1,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["catto"]
+catto: { number_of_documents: 1, field_distribution: {"id": 1} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/task_deletion_deleteable/after_registering_the_task_deletion.snap b/index-scheduler/src/snapshots/lib.rs/task_deletion_deleteable/after_registering_the_task_deletion.snap
index 3c3bd754e..302fd5f5e 100644
--- a/index-scheduler/src/snapshots/lib.rs/task_deletion_deleteable/after_registering_the_task_deletion.snap
+++ b/index-scheduler/src/snapshots/lib.rs/task_deletion_deleteable/after_registering_the_task_deletion.snap
@@ -23,7 +23,8 @@ catto [0,]
 doggo [1,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["catto"]
+catto: { number_of_documents: 1, field_distribution: {"id": 1} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/task_deletion_deleteable/initial_tasks_enqueued.snap b/index-scheduler/src/snapshots/lib.rs/task_deletion_deleteable/initial_tasks_enqueued.snap
index fc37dcf2d..4b4a50bfb 100644
--- a/index-scheduler/src/snapshots/lib.rs/task_deletion_deleteable/initial_tasks_enqueued.snap
+++ b/index-scheduler/src/snapshots/lib.rs/task_deletion_deleteable/initial_tasks_enqueued.snap
@@ -20,7 +20,7 @@ catto [0,]
 doggo [1,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/task_deletion_deleteable/initial_tasks_processed.snap b/index-scheduler/src/snapshots/lib.rs/task_deletion_deleteable/initial_tasks_processed.snap
index e4c4d9d7e..6e3a6e8ed 100644
--- a/index-scheduler/src/snapshots/lib.rs/task_deletion_deleteable/initial_tasks_processed.snap
+++ b/index-scheduler/src/snapshots/lib.rs/task_deletion_deleteable/initial_tasks_processed.snap
@@ -21,7 +21,8 @@ catto [0,]
 doggo [1,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["catto"]
+catto: { number_of_documents: 1, field_distribution: {"id": 1} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/task_deletion_deleteable/task_deletion_processed.snap b/index-scheduler/src/snapshots/lib.rs/task_deletion_deleteable/task_deletion_processed.snap
index 29c251027..cf64406b8 100644
--- a/index-scheduler/src/snapshots/lib.rs/task_deletion_deleteable/task_deletion_processed.snap
+++ b/index-scheduler/src/snapshots/lib.rs/task_deletion_deleteable/task_deletion_processed.snap
@@ -21,7 +21,8 @@ succeeded [2,]
 doggo [1,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["catto"]
+catto: { number_of_documents: 1, field_distribution: {"id": 1} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/task_deletion_undeleteable/initial_tasks_enqueued.snap b/index-scheduler/src/snapshots/lib.rs/task_deletion_undeleteable/initial_tasks_enqueued.snap
index afb8af39c..25e2deadc 100644
--- a/index-scheduler/src/snapshots/lib.rs/task_deletion_undeleteable/initial_tasks_enqueued.snap
+++ b/index-scheduler/src/snapshots/lib.rs/task_deletion_undeleteable/initial_tasks_enqueued.snap
@@ -22,7 +22,7 @@ catto [0,1,]
 doggo [2,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/task_deletion_undeleteable/task_deletion_done.snap b/index-scheduler/src/snapshots/lib.rs/task_deletion_undeleteable/task_deletion_done.snap
index 6fc0a4f7c..743cd615f 100644
--- a/index-scheduler/src/snapshots/lib.rs/task_deletion_undeleteable/task_deletion_done.snap
+++ b/index-scheduler/src/snapshots/lib.rs/task_deletion_undeleteable/task_deletion_done.snap
@@ -25,7 +25,7 @@ catto [0,1,]
 doggo [2,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/task_deletion_undeleteable/task_deletion_enqueued.snap b/index-scheduler/src/snapshots/lib.rs/task_deletion_undeleteable/task_deletion_enqueued.snap
index e2ad01246..5c4d9be04 100644
--- a/index-scheduler/src/snapshots/lib.rs/task_deletion_undeleteable/task_deletion_enqueued.snap
+++ b/index-scheduler/src/snapshots/lib.rs/task_deletion_undeleteable/task_deletion_enqueued.snap
@@ -24,7 +24,7 @@ catto [0,1,]
 doggo [2,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/task_deletion_undeleteable/task_deletion_processing.snap b/index-scheduler/src/snapshots/lib.rs/task_deletion_undeleteable/task_deletion_processing.snap
index 8017f77b9..49df62cb7 100644
--- a/index-scheduler/src/snapshots/lib.rs/task_deletion_undeleteable/task_deletion_processing.snap
+++ b/index-scheduler/src/snapshots/lib.rs/task_deletion_undeleteable/task_deletion_processing.snap
@@ -24,7 +24,7 @@ catto [0,1,]
 doggo [2,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index/after_processing_the_10_tasks.snap b/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index/after_processing_the_10_tasks.snap
index d112c8145..cb6ec63de 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index/after_processing_the_10_tasks.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index/after_processing_the_10_tasks.snap
@@ -30,7 +30,8 @@ succeeded [0,1,2,3,4,5,6,7,8,9,10,]
 doggos [0,1,2,3,4,5,6,7,8,9,10,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 10, field_distribution: {"doggo": 10, "id": 10} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index/after_registering_the_10_tasks.snap b/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index/after_registering_the_10_tasks.snap
index 7daafcccb..2e4845fb4 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index/after_registering_the_10_tasks.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index/after_registering_the_10_tasks.snap
@@ -30,7 +30,8 @@ succeeded [0,]
 doggos [0,1,2,3,4,5,6,7,8,9,10,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 0, field_distribution: {} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index/processed_the_first_task.snap b/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index/processed_the_first_task.snap
index ed265ac6e..e046ed386 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index/processed_the_first_task.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index/processed_the_first_task.snap
@@ -19,7 +19,8 @@ succeeded [0,]
 doggos [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 0, field_distribution: {} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index/registered_the_first_task.snap b/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index/registered_the_first_task.snap
index e23cd648f..1a29c1ac6 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index/registered_the_first_task.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index/registered_the_first_task.snap
@@ -18,7 +18,7 @@ enqueued [0,]
 doggos [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index_without_autobatching/after_registering_the_10_tasks.snap b/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index_without_autobatching/after_registering_the_10_tasks.snap
index 83f17bcef..e2e2133f5 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index_without_autobatching/after_registering_the_10_tasks.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index_without_autobatching/after_registering_the_10_tasks.snap
@@ -30,7 +30,8 @@ succeeded [0,]
 doggos [0,1,2,3,4,5,6,7,8,9,10,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 0, field_distribution: {} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index_without_autobatching/all_tasks_processed.snap b/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index_without_autobatching/all_tasks_processed.snap
index fc2fdc5f1..970587ba2 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index_without_autobatching/all_tasks_processed.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index_without_autobatching/all_tasks_processed.snap
@@ -30,7 +30,8 @@ succeeded [0,1,2,3,4,5,6,7,8,9,10,]
 doggos [0,1,2,3,4,5,6,7,8,9,10,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 10, field_distribution: {"doggo": 10, "id": 10} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index_without_autobatching/five_tasks_processed.snap b/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index_without_autobatching/five_tasks_processed.snap
index 48f972785..5de505cf2 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index_without_autobatching/five_tasks_processed.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index_without_autobatching/five_tasks_processed.snap
@@ -30,7 +30,8 @@ succeeded [0,1,2,3,4,5,]
 doggos [0,1,2,3,4,5,6,7,8,9,10,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 5, field_distribution: {"doggo": 5, "id": 5} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index_without_autobatching/processed_the_first_task.snap b/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index_without_autobatching/processed_the_first_task.snap
index 6214f3139..606367737 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index_without_autobatching/processed_the_first_task.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index_without_autobatching/processed_the_first_task.snap
@@ -19,7 +19,8 @@ succeeded [0,]
 doggos [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 0, field_distribution: {} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index_without_autobatching/registered_the_first_task.snap b/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index_without_autobatching/registered_the_first_task.snap
index 52866bed6..c2ad519fa 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index_without_autobatching/registered_the_first_task.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_with_index_without_autobatching/registered_the_first_task.snap
@@ -18,7 +18,7 @@ enqueued [0,]
 doggos [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_without_index/after_processing_the_10_tasks.snap b/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_without_index/after_processing_the_10_tasks.snap
index ed28c121b..5a6ea9100 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_without_index/after_processing_the_10_tasks.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_without_index/after_processing_the_10_tasks.snap
@@ -28,7 +28,7 @@ failed [0,1,2,3,4,5,6,7,8,9,]
 doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_without_index/after_registering_the_10_tasks.snap b/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_without_index/after_registering_the_10_tasks.snap
index 828d4dafc..e2217e1f4 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_without_index/after_registering_the_10_tasks.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_without_index/after_registering_the_10_tasks.snap
@@ -27,7 +27,7 @@ enqueued [0,1,2,3,4,5,6,7,8,9,]
 doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_without_index_without_autobatching/after_registering_the_10_tasks.snap b/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_without_index_without_autobatching/after_registering_the_10_tasks.snap
index 671713c8e..02d0b1988 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_without_index_without_autobatching/after_registering_the_10_tasks.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_without_index_without_autobatching/after_registering_the_10_tasks.snap
@@ -27,7 +27,7 @@ enqueued [0,1,2,3,4,5,6,7,8,9,]
 doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_without_index_without_autobatching/all_tasks_processed.snap b/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_without_index_without_autobatching/all_tasks_processed.snap
index d995cab9e..8164394c8 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_without_index_without_autobatching/all_tasks_processed.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_without_index_without_autobatching/all_tasks_processed.snap
@@ -28,7 +28,7 @@ failed [0,1,2,3,4,5,6,7,8,9,]
 doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_without_index_without_autobatching/five_tasks_processed.snap b/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_without_index_without_autobatching/five_tasks_processed.snap
index 3ae875bff..4e0bb97ab 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_without_index_without_autobatching/five_tasks_processed.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_addition_cant_create_index_without_index_without_autobatching/five_tasks_processed.snap
@@ -28,7 +28,7 @@ failed [0,1,2,3,4,]
 doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_right_without_index_starts_with_cant_create/after_registering_the_10_tasks.snap b/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_right_without_index_starts_with_cant_create/after_registering_the_10_tasks.snap
index ad5968b58..f98802f21 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_right_without_index_starts_with_cant_create/after_registering_the_10_tasks.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_right_without_index_starts_with_cant_create/after_registering_the_10_tasks.snap
@@ -27,7 +27,7 @@ enqueued [0,1,2,3,4,5,6,7,8,9,]
 doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_right_without_index_starts_with_cant_create/all_tasks_processed.snap b/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_right_without_index_starts_with_cant_create/all_tasks_processed.snap
index 19ee47359..ea6ef400a 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_right_without_index_starts_with_cant_create/all_tasks_processed.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_right_without_index_starts_with_cant_create/all_tasks_processed.snap
@@ -29,7 +29,8 @@ failed [0,]
 doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 9, field_distribution: {"doggo": 9, "id": 9} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_right_without_index_starts_with_cant_create/only_first_task_failed.snap b/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_right_without_index_starts_with_cant_create/only_first_task_failed.snap
index ed57bc4e3..c27a1b5cb 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_right_without_index_starts_with_cant_create/only_first_task_failed.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_right_without_index_starts_with_cant_create/only_first_task_failed.snap
@@ -28,7 +28,7 @@ failed [0,]
 doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_rights_with_index/after_registering_the_10_tasks.snap b/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_rights_with_index/after_registering_the_10_tasks.snap
index 61b7f3016..68599f03e 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_rights_with_index/after_registering_the_10_tasks.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_rights_with_index/after_registering_the_10_tasks.snap
@@ -30,7 +30,8 @@ succeeded [0,]
 doggos [0,1,2,3,4,5,6,7,8,9,10,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 0, field_distribution: {} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_rights_with_index/all_tasks_processed.snap b/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_rights_with_index/all_tasks_processed.snap
index 0962dcdf5..b442a9c2f 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_rights_with_index/all_tasks_processed.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_rights_with_index/all_tasks_processed.snap
@@ -30,7 +30,8 @@ succeeded [0,1,2,3,4,5,6,7,8,9,10,]
 doggos [0,1,2,3,4,5,6,7,8,9,10,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 10, field_distribution: {"doggo": 10, "id": 10} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_rights_with_index/processed_the_first_task.snap b/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_rights_with_index/processed_the_first_task.snap
index ed265ac6e..e046ed386 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_rights_with_index/processed_the_first_task.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_rights_with_index/processed_the_first_task.snap
@@ -19,7 +19,8 @@ succeeded [0,]
 doggos [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 0, field_distribution: {} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_rights_with_index/registered_the_first_task.snap b/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_rights_with_index/registered_the_first_task.snap
index e23cd648f..1a29c1ac6 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_rights_with_index/registered_the_first_task.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_addition_mixed_rights_with_index/registered_the_first_task.snap
@@ -18,7 +18,7 @@ enqueued [0,]
 doggos [0,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_bad_primary_key/after_registering_the_5_tasks.snap b/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_bad_primary_key/after_registering_the_5_tasks.snap
index 53d3d28da..fde8e3451 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_bad_primary_key/after_registering_the_5_tasks.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_bad_primary_key/after_registering_the_5_tasks.snap
@@ -22,7 +22,7 @@ enqueued [0,1,2,3,4,]
 doggos [0,1,2,3,4,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_bad_primary_key/fifth_task_succeeds.snap b/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_bad_primary_key/fifth_task_succeeds.snap
index 58e16fa55..85d7ba460 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_bad_primary_key/fifth_task_succeeds.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_bad_primary_key/fifth_task_succeeds.snap
@@ -24,7 +24,8 @@ failed [0,1,3,]
 doggos [0,1,2,3,4,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 2, field_distribution: {"doggo": 2, "id": 2} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_bad_primary_key/first_and_second_task_fails.snap b/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_bad_primary_key/first_and_second_task_fails.snap
index 98bd2b580..ab788cc36 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_bad_primary_key/first_and_second_task_fails.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_bad_primary_key/first_and_second_task_fails.snap
@@ -23,7 +23,8 @@ failed [0,1,]
 doggos [0,1,2,3,4,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 0, field_distribution: {} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_bad_primary_key/fourth_task_fails.snap b/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_bad_primary_key/fourth_task_fails.snap
index 279040fdb..2a8748657 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_bad_primary_key/fourth_task_fails.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_bad_primary_key/fourth_task_fails.snap
@@ -24,7 +24,8 @@ failed [0,1,3,]
 doggos [0,1,2,3,4,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 1, field_distribution: {"doggo": 1, "id": 1} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_bad_primary_key/third_task_succeeds.snap b/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_bad_primary_key/third_task_succeeds.snap
index 441bb59e2..58cdbe432 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_bad_primary_key/third_task_succeeds.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_bad_primary_key/third_task_succeeds.snap
@@ -24,7 +24,8 @@ failed [0,1,]
 doggos [0,1,2,3,4,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 1, field_distribution: {"doggo": 1, "id": 1} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key/after_registering_the_3_tasks.snap b/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key/after_registering_the_3_tasks.snap
index cff9b0bd9..5699c58c4 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key/after_registering_the_3_tasks.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key/after_registering_the_3_tasks.snap
@@ -20,7 +20,7 @@ enqueued [0,1,2,]
 doggos [0,1,2,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key/only_first_task_succeed.snap b/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key/only_first_task_succeed.snap
index d3888af01..85689fa4d 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key/only_first_task_succeed.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key/only_first_task_succeed.snap
@@ -21,7 +21,8 @@ succeeded [0,]
 doggos [0,1,2,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 1, field_distribution: {"doggo": 1, "id": 1} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key/second_task_fails.snap b/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key/second_task_fails.snap
index 84baeca92..18db64ca4 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key/second_task_fails.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key/second_task_fails.snap
@@ -22,7 +22,8 @@ failed [1,]
 doggos [0,1,2,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 1, field_distribution: {"doggo": 1, "id": 1} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key/third_task_fails.snap b/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key/third_task_fails.snap
index 6b92f91d1..4a9edc602 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key/third_task_fails.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key/third_task_fails.snap
@@ -22,7 +22,8 @@ failed [1,2,]
 doggos [0,1,2,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 1, field_distribution: {"doggo": 1, "id": 1} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key_batch_wrong_key/after_registering_the_3_tasks.snap b/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key_batch_wrong_key/after_registering_the_3_tasks.snap
index 4c4f88a30..1187159b7 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key_batch_wrong_key/after_registering_the_3_tasks.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key_batch_wrong_key/after_registering_the_3_tasks.snap
@@ -20,7 +20,7 @@ enqueued [0,1,2,]
 doggos [0,1,2,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key_batch_wrong_key/only_first_task_succeed.snap b/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key_batch_wrong_key/only_first_task_succeed.snap
index 76b814eab..22b91bb60 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key_batch_wrong_key/only_first_task_succeed.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key_batch_wrong_key/only_first_task_succeed.snap
@@ -21,7 +21,8 @@ succeeded [0,]
 doggos [0,1,2,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 1, field_distribution: {"doggo": 1, "id": 1} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key_batch_wrong_key/second_and_third_tasks_fails.snap b/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key_batch_wrong_key/second_and_third_tasks_fails.snap
index 26b0f6584..05eca0af1 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key_batch_wrong_key/second_and_third_tasks_fails.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_multiple_primary_key_batch_wrong_key/second_and_third_tasks_fails.snap
@@ -22,7 +22,8 @@ failed [1,]
 doggos [0,1,2,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 1, field_distribution: {"doggo": 1, "id": 1} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key/after_registering_the_6_tasks.snap b/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key/after_registering_the_6_tasks.snap
index 078ba06d3..47b0994ec 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key/after_registering_the_6_tasks.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key/after_registering_the_6_tasks.snap
@@ -23,7 +23,7 @@ enqueued [0,1,2,3,4,5,]
 doggos [0,1,2,3,4,5,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key/all_other_tasks_succeeds.snap b/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key/all_other_tasks_succeeds.snap
index 69cbd3def..a7464685a 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key/all_other_tasks_succeeds.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key/all_other_tasks_succeeds.snap
@@ -25,7 +25,8 @@ failed [0,1,]
 doggos [0,1,2,3,4,5,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 4, field_distribution: {"doggo": 4, "paw": 4} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key/first_task_fails.snap b/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key/first_task_fails.snap
index ac63f3b58..5c7f7e8d8 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key/first_task_fails.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key/first_task_fails.snap
@@ -24,7 +24,8 @@ failed [0,]
 doggos [0,1,2,3,4,5,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 0, field_distribution: {} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key/second_task_fails.snap b/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key/second_task_fails.snap
index 538b4af93..2c255aeba 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key/second_task_fails.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key/second_task_fails.snap
@@ -24,7 +24,8 @@ failed [0,1,]
 doggos [0,1,2,3,4,5,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 0, field_distribution: {} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key/third_task_succeeds.snap b/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key/third_task_succeeds.snap
index 1271b6f92..2f944adcf 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key/third_task_succeeds.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key/third_task_succeeds.snap
@@ -25,7 +25,8 @@ failed [0,1,]
 doggos [0,1,2,3,4,5,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 1, field_distribution: {"doggo": 1, "paw": 1} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key_inference_works/after_registering_the_6_tasks.snap b/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key_inference_works/after_registering_the_6_tasks.snap
index 0e9ecb81a..c89abf033 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key_inference_works/after_registering_the_6_tasks.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key_inference_works/after_registering_the_6_tasks.snap
@@ -23,7 +23,7 @@ enqueued [0,1,2,3,4,5,]
 doggos [0,1,2,3,4,5,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key_inference_works/all_other_tasks_succeeds.snap b/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key_inference_works/all_other_tasks_succeeds.snap
index 437c6375e..1f55e8f6d 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key_inference_works/all_other_tasks_succeeds.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key_inference_works/all_other_tasks_succeeds.snap
@@ -25,7 +25,8 @@ failed [1,]
 doggos [0,1,2,3,4,5,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 5, field_distribution: {"doggo": 5, "doggoid": 5} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key_inference_works/first_task_succeed.snap b/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key_inference_works/first_task_succeed.snap
index fd480420a..532cef143 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key_inference_works/first_task_succeed.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key_inference_works/first_task_succeed.snap
@@ -24,7 +24,8 @@ succeeded [0,]
 doggos [0,1,2,3,4,5,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 1, field_distribution: {"doggo": 1, "doggoid": 1} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key_inference_works/second_task_fails.snap b/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key_inference_works/second_task_fails.snap
index 99001edb0..2920c3b2e 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key_inference_works/second_task_fails.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key_inference_works/second_task_fails.snap
@@ -25,7 +25,8 @@ failed [1,]
 doggos [0,1,2,3,4,5,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 1, field_distribution: {"doggo": 1, "doggoid": 1} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key_inference_works/third_task_succeeds.snap b/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key_inference_works/third_task_succeeds.snap
index 64625ca90..8981dd8c3 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key_inference_works/third_task_succeeds.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_addition_with_set_and_null_primary_key_inference_works/third_task_succeeds.snap
@@ -25,7 +25,8 @@ failed [1,]
 doggos [0,1,2,3,4,5,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 2, field_distribution: {"doggo": 2, "doggoid": 2} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_replace/1.snap b/index-scheduler/src/snapshots/lib.rs/test_document_replace/1.snap
index a47ef319f..21581fe78 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_replace/1.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_replace/1.snap
@@ -27,7 +27,7 @@ enqueued [0,1,2,3,4,5,6,7,8,9,]
 doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_replace/2.snap b/index-scheduler/src/snapshots/lib.rs/test_document_replace/2.snap
index f6423719c..fabf764bc 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_replace/2.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_replace/2.snap
@@ -28,7 +28,8 @@ succeeded [0,1,2,3,4,5,6,7,8,9,]
 doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 10, field_distribution: {"doggo": 10, "id": 10} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_replace_without_autobatching/after_registering_the_10_tasks.snap b/index-scheduler/src/snapshots/lib.rs/test_document_replace_without_autobatching/after_registering_the_10_tasks.snap
index 0f52c9664..1beba7264 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_replace_without_autobatching/after_registering_the_10_tasks.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_replace_without_autobatching/after_registering_the_10_tasks.snap
@@ -27,7 +27,7 @@ enqueued [0,1,2,3,4,5,6,7,8,9,]
 doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_replace_without_autobatching/all_tasks_processed.snap b/index-scheduler/src/snapshots/lib.rs/test_document_replace_without_autobatching/all_tasks_processed.snap
index b80b8bb40..a0b121320 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_replace_without_autobatching/all_tasks_processed.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_replace_without_autobatching/all_tasks_processed.snap
@@ -28,7 +28,8 @@ succeeded [0,1,2,3,4,5,6,7,8,9,]
 doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 10, field_distribution: {"doggo": 10, "id": 10} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_replace_without_autobatching/five_tasks_processed.snap b/index-scheduler/src/snapshots/lib.rs/test_document_replace_without_autobatching/five_tasks_processed.snap
index b1528c103..88bf59f8e 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_replace_without_autobatching/five_tasks_processed.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_replace_without_autobatching/five_tasks_processed.snap
@@ -28,7 +28,8 @@ succeeded [0,1,2,3,4,]
 doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 5, field_distribution: {"doggo": 5, "id": 5} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_update/1.snap b/index-scheduler/src/snapshots/lib.rs/test_document_update/1.snap
index 6157fb454..53f0fbc9b 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_update/1.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_update/1.snap
@@ -27,7 +27,7 @@ enqueued [0,1,2,3,4,5,6,7,8,9,]
 doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_update/2.snap b/index-scheduler/src/snapshots/lib.rs/test_document_update/2.snap
index 736f998d0..d8383818e 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_update/2.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_update/2.snap
@@ -28,7 +28,8 @@ succeeded [0,1,2,3,4,5,6,7,8,9,]
 doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 10, field_distribution: {"doggo": 10, "id": 10} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_update_without_autobatching/after_registering_the_10_tasks.snap b/index-scheduler/src/snapshots/lib.rs/test_document_update_without_autobatching/after_registering_the_10_tasks.snap
index 85fda1a43..6785786e3 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_update_without_autobatching/after_registering_the_10_tasks.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_update_without_autobatching/after_registering_the_10_tasks.snap
@@ -27,7 +27,7 @@ enqueued [0,1,2,3,4,5,6,7,8,9,]
 doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_update_without_autobatching/all_tasks_processed.snap b/index-scheduler/src/snapshots/lib.rs/test_document_update_without_autobatching/all_tasks_processed.snap
index a1fc55210..4c8fd7ea6 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_update_without_autobatching/all_tasks_processed.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_update_without_autobatching/all_tasks_processed.snap
@@ -28,7 +28,8 @@ succeeded [0,1,2,3,4,5,6,7,8,9,]
 doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 10, field_distribution: {"doggo": 10, "id": 10} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_document_update_without_autobatching/five_tasks_processed.snap b/index-scheduler/src/snapshots/lib.rs/test_document_update_without_autobatching/five_tasks_processed.snap
index fb0b629ec..f184bb3cb 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_document_update_without_autobatching/five_tasks_processed.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_document_update_without_autobatching/five_tasks_processed.snap
@@ -28,7 +28,8 @@ succeeded [0,1,2,3,4,]
 doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 5, field_distribution: {"doggo": 5, "id": 5} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_mixed_document_addition/after_registering_the_10_tasks.snap b/index-scheduler/src/snapshots/lib.rs/test_mixed_document_addition/after_registering_the_10_tasks.snap
index 330a3318e..9095f031b 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_mixed_document_addition/after_registering_the_10_tasks.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_mixed_document_addition/after_registering_the_10_tasks.snap
@@ -27,7 +27,7 @@ enqueued [0,1,2,3,4,5,6,7,8,9,]
 doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-[]
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_mixed_document_addition/all_tasks_processed.snap b/index-scheduler/src/snapshots/lib.rs/test_mixed_document_addition/all_tasks_processed.snap
index 20fda049f..6c6fba517 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_mixed_document_addition/all_tasks_processed.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_mixed_document_addition/all_tasks_processed.snap
@@ -28,7 +28,8 @@ succeeded [0,1,2,3,4,5,6,7,8,9,]
 doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 10, field_distribution: {"doggo": 10, "id": 10} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/index-scheduler/src/snapshots/lib.rs/test_mixed_document_addition/five_tasks_processed.snap b/index-scheduler/src/snapshots/lib.rs/test_mixed_document_addition/five_tasks_processed.snap
index 9fd990aa9..8aa7cfbea 100644
--- a/index-scheduler/src/snapshots/lib.rs/test_mixed_document_addition/five_tasks_processed.snap
+++ b/index-scheduler/src/snapshots/lib.rs/test_mixed_document_addition/five_tasks_processed.snap
@@ -28,7 +28,8 @@ succeeded [0,1,2,3,4,]
 doggos [0,1,2,3,4,5,6,7,8,9,]
 ----------------------------------------------------------------------
 ### Index Mapper:
-["doggos"]
+doggos: { number_of_documents: 5, field_distribution: {"doggo": 5, "id": 5} }
+
 ----------------------------------------------------------------------
 ### Canceled By:
 
diff --git a/meilisearch-auth/src/lib.rs b/meilisearch-auth/src/lib.rs
index 8d5457766..05f320dfb 100644
--- a/meilisearch-auth/src/lib.rs
+++ b/meilisearch-auth/src/lib.rs
@@ -34,6 +34,12 @@ impl AuthController {
         Ok(Self { store: Arc::new(store), master_key: master_key.clone() })
     }
 
+    /// Return `Ok(())` if the auth controller is able to access one of its database.
+    pub fn health(&self) -> Result<()> {
+        self.store.health()?;
+        Ok(())
+    }
+
     /// Return the size of the `AuthController` database in bytes.
     pub fn size(&self) -> Result<u64> {
         self.store.size()
diff --git a/meilisearch-auth/src/store.rs b/meilisearch-auth/src/store.rs
index cc5dcdfb5..5c2776154 100644
--- a/meilisearch-auth/src/store.rs
+++ b/meilisearch-auth/src/store.rs
@@ -61,6 +61,13 @@ impl HeedAuthStore {
         Ok(Self { env, keys, action_keyid_index_expiration, should_close_on_drop: true })
     }
 
+    /// Return `Ok(())` if the auth store is able to access one of its database.
+    pub fn health(&self) -> Result<()> {
+        let rtxn = self.env.read_txn()?;
+        self.keys.first(&rtxn)?;
+        Ok(())
+    }
+
     /// Return the size in bytes of database
     pub fn size(&self) -> Result<u64> {
         Ok(self.env.real_disk_size()?)
diff --git a/meilisearch/Cargo.toml b/meilisearch/Cargo.toml
index 809975ec7..d4b772322 100644
--- a/meilisearch/Cargo.toml
+++ b/meilisearch/Cargo.toml
@@ -115,5 +115,5 @@ japanese = ["meilisearch-types/japanese"]
 thai = ["meilisearch-types/thai"]
 
 [package.metadata.mini-dashboard]
-assets-url = "https://github.com/meilisearch/mini-dashboard/releases/download/v0.2.6/build.zip"
-sha1 = "dce0aba16bceab5549edf9f01de89858800f7422"
+assets-url = "https://github.com/meilisearch/mini-dashboard/releases/download/v0.2.7/build.zip"
+sha1 = "28b45bf772c84f9a6e16bc1689b393bfce8da7d6"
diff --git a/meilisearch/src/analytics/segment_analytics.rs b/meilisearch/src/analytics/segment_analytics.rs
index 2bc79625a..4f02ed60c 100644
--- a/meilisearch/src/analytics/segment_analytics.rs
+++ b/meilisearch/src/analytics/segment_analytics.rs
@@ -86,7 +86,7 @@ impl SegmentAnalytics {
     pub async fn new(
         opt: &Opt,
         index_scheduler: Arc<IndexScheduler>,
-        auth_controller: AuthController,
+        auth_controller: Arc<AuthController>,
     ) -> Arc<dyn Analytics> {
         let instance_uid = super::find_user_id(&opt.db_path);
         let first_time_run = instance_uid.is_none();
@@ -376,7 +376,11 @@ impl Segment {
         })
     }
 
-    async fn run(mut self, index_scheduler: Arc<IndexScheduler>, auth_controller: AuthController) {
+    async fn run(
+        mut self,
+        index_scheduler: Arc<IndexScheduler>,
+        auth_controller: Arc<AuthController>,
+    ) {
         const INTERVAL: Duration = Duration::from_secs(60 * 60); // one hour
                                                                  // The first batch must be sent after one hour.
         let mut interval =
@@ -408,10 +412,10 @@ impl Segment {
     async fn tick(
         &mut self,
         index_scheduler: Arc<IndexScheduler>,
-        auth_controller: AuthController,
+        auth_controller: Arc<AuthController>,
     ) {
         if let Ok(stats) =
-            create_all_stats(index_scheduler.into(), auth_controller, &AuthFilter::default())
+            create_all_stats(index_scheduler.into(), auth_controller.into(), &AuthFilter::default())
         {
             // Replace the version number with the prototype name if any.
             let version = if let Some(prototype) = crate::prototype_name() {
diff --git a/meilisearch/src/extractors/authentication/mod.rs b/meilisearch/src/extractors/authentication/mod.rs
index 6373d6a29..007e2be40 100644
--- a/meilisearch/src/extractors/authentication/mod.rs
+++ b/meilisearch/src/extractors/authentication/mod.rs
@@ -4,6 +4,7 @@ use std::marker::PhantomData;
 use std::ops::Deref;
 use std::pin::Pin;
 
+use actix_web::web::Data;
 use actix_web::FromRequest;
 pub use error::AuthenticationError;
 use futures::future::err;
@@ -23,7 +24,7 @@ impl<P, D> GuardedData<P, D> {
     }
 
     async fn auth_bearer(
-        auth: AuthController,
+        auth: Data<AuthController>,
         token: String,
         index: Option<String>,
         data: Option<D>,
@@ -43,7 +44,7 @@ impl<P, D> GuardedData<P, D> {
         }
     }
 
-    async fn auth_token(auth: AuthController, data: Option<D>) -> Result<Self, ResponseError>
+    async fn auth_token(auth: Data<AuthController>, data: Option<D>) -> Result<Self, ResponseError>
     where
         P: Policy + 'static,
     {
@@ -60,7 +61,7 @@ impl<P, D> GuardedData<P, D> {
     }
 
     async fn authenticate(
-        auth: AuthController,
+        auth: Data<AuthController>,
         token: String,
         index: Option<String>,
     ) -> Result<Option<AuthFilter>, ResponseError>
@@ -90,7 +91,7 @@ impl<P: Policy + 'static, D: 'static + Clone> FromRequest for GuardedData<P, D>
         req: &actix_web::HttpRequest,
         _payload: &mut actix_web::dev::Payload,
     ) -> Self::Future {
-        match req.app_data::<AuthController>().cloned() {
+        match req.app_data::<Data<AuthController>>().cloned() {
             Some(auth) => match req
                 .headers()
                 .get("Authorization")
@@ -122,10 +123,15 @@ impl<P: Policy + 'static, D: 'static + Clone> FromRequest for GuardedData<P, D>
 }
 
 pub trait Policy {
-    fn authenticate(auth: AuthController, token: &str, index: Option<&str>) -> Option<AuthFilter>;
+    fn authenticate(
+        auth: Data<AuthController>,
+        token: &str,
+        index: Option<&str>,
+    ) -> Option<AuthFilter>;
 }
 
 pub mod policies {
+    use actix_web::web::Data;
     use jsonwebtoken::{decode, Algorithm, DecodingKey, Validation};
     use meilisearch_auth::{AuthController, AuthFilter, SearchRules};
     // reexport actions in policies in order to be used in routes configuration.
@@ -178,7 +184,7 @@ pub mod policies {
         /// Otherwise, returns an object containing the generated permissions: the search filters to add to a search, and the list of allowed indexes
         /// (that may contain more indexes than requested).
         fn authenticate(
-            auth: AuthController,
+            auth: Data<AuthController>,
             token: &str,
             index: Option<&str>,
         ) -> Option<AuthFilter> {
diff --git a/meilisearch/src/lib.rs b/meilisearch/src/lib.rs
index 13c236983..9f85a4c5c 100644
--- a/meilisearch/src/lib.rs
+++ b/meilisearch/src/lib.rs
@@ -88,7 +88,7 @@ fn is_empty_db(db_path: impl AsRef<Path>) -> bool {
 
 pub fn create_app(
     index_scheduler: Data<IndexScheduler>,
-    auth_controller: AuthController,
+    auth_controller: Data<AuthController>,
     opt: Opt,
     analytics: Arc<dyn Analytics>,
     enable_dashboard: bool,
@@ -136,7 +136,7 @@ enum OnFailure {
     KeepDb,
 }
 
-pub fn setup_meilisearch(opt: &Opt) -> anyhow::Result<(Arc<IndexScheduler>, AuthController)> {
+pub fn setup_meilisearch(opt: &Opt) -> anyhow::Result<(Arc<IndexScheduler>, Arc<AuthController>)> {
     let empty_db = is_empty_db(&opt.db_path);
     let (index_scheduler, auth_controller) = if let Some(ref snapshot_path) = opt.import_snapshot {
         let snapshot_path_exists = snapshot_path.exists();
@@ -195,6 +195,7 @@ pub fn setup_meilisearch(opt: &Opt) -> anyhow::Result<(Arc<IndexScheduler>, Auth
 
     // We create a loop in a thread that registers snapshotCreation tasks
     let index_scheduler = Arc::new(index_scheduler);
+    let auth_controller = Arc::new(auth_controller);
     if let ScheduleSnapshot::Enabled(snapshot_delay) = opt.schedule_snapshot {
         let snapshot_delay = Duration::from_secs(snapshot_delay);
         let index_scheduler = index_scheduler.clone();
@@ -367,18 +368,20 @@ fn import_dump(
         log::info!("All documents successfully imported.");
     }
 
+    let mut index_scheduler_dump = index_scheduler.register_dumped_task()?;
+
     // 4. Import the tasks.
     for ret in dump_reader.tasks()? {
         let (task, file) = ret?;
-        index_scheduler.register_dumped_task(task, file)?;
+        index_scheduler_dump.register_dumped_task(task, file)?;
     }
-    Ok(())
+    Ok(index_scheduler_dump.finish()?)
 }
 
 pub fn configure_data(
     config: &mut web::ServiceConfig,
     index_scheduler: Data<IndexScheduler>,
-    auth: AuthController,
+    auth: Data<AuthController>,
     opt: &Opt,
     analytics: Arc<dyn Analytics>,
 ) {
diff --git a/meilisearch/src/main.rs b/meilisearch/src/main.rs
index d12539e20..c80245c7e 100644
--- a/meilisearch/src/main.rs
+++ b/meilisearch/src/main.rs
@@ -74,13 +74,14 @@ async fn main() -> anyhow::Result<()> {
 
 async fn run_http(
     index_scheduler: Arc<IndexScheduler>,
-    auth_controller: AuthController,
+    auth_controller: Arc<AuthController>,
     opt: Opt,
     analytics: Arc<dyn Analytics>,
 ) -> anyhow::Result<()> {
     let enable_dashboard = &opt.env == "development";
     let opt_clone = opt.clone();
     let index_scheduler = Data::from(index_scheduler);
+    let auth_controller = Data::from(auth_controller);
 
     let http_server = HttpServer::new(move || {
         create_app(
diff --git a/meilisearch/src/routes/api_key.rs b/meilisearch/src/routes/api_key.rs
index 7514d01f6..597d04486 100644
--- a/meilisearch/src/routes/api_key.rs
+++ b/meilisearch/src/routes/api_key.rs
@@ -1,5 +1,6 @@
 use std::str;
 
+use actix_web::web::Data;
 use actix_web::{web, HttpRequest, HttpResponse};
 use deserr::actix_web::{AwebJson, AwebQueryParameter};
 use deserr::Deserr;
@@ -35,7 +36,7 @@ pub fn configure(cfg: &mut web::ServiceConfig) {
 }
 
 pub async fn create_api_key(
-    auth_controller: GuardedData<ActionPolicy<{ actions::KEYS_CREATE }>, AuthController>,
+    auth_controller: GuardedData<ActionPolicy<{ actions::KEYS_CREATE }>, Data<AuthController>>,
     body: AwebJson<CreateApiKey, DeserrJsonError>,
     _req: HttpRequest,
 ) -> Result<HttpResponse, ResponseError> {
@@ -66,7 +67,7 @@ impl ListApiKeys {
 }
 
 pub async fn list_api_keys(
-    auth_controller: GuardedData<ActionPolicy<{ actions::KEYS_GET }>, AuthController>,
+    auth_controller: GuardedData<ActionPolicy<{ actions::KEYS_GET }>, Data<AuthController>>,
     list_api_keys: AwebQueryParameter<ListApiKeys, DeserrQueryParamError>,
 ) -> Result<HttpResponse, ResponseError> {
     let paginate = list_api_keys.into_inner().as_pagination();
@@ -84,7 +85,7 @@ pub async fn list_api_keys(
 }
 
 pub async fn get_api_key(
-    auth_controller: GuardedData<ActionPolicy<{ actions::KEYS_GET }>, AuthController>,
+    auth_controller: GuardedData<ActionPolicy<{ actions::KEYS_GET }>, Data<AuthController>>,
     path: web::Path<AuthParam>,
 ) -> Result<HttpResponse, ResponseError> {
     let key = path.into_inner().key;
@@ -103,7 +104,7 @@ pub async fn get_api_key(
 }
 
 pub async fn patch_api_key(
-    auth_controller: GuardedData<ActionPolicy<{ actions::KEYS_UPDATE }>, AuthController>,
+    auth_controller: GuardedData<ActionPolicy<{ actions::KEYS_UPDATE }>, Data<AuthController>>,
     body: AwebJson<PatchApiKey, DeserrJsonError>,
     path: web::Path<AuthParam>,
 ) -> Result<HttpResponse, ResponseError> {
@@ -123,7 +124,7 @@ pub async fn patch_api_key(
 }
 
 pub async fn delete_api_key(
-    auth_controller: GuardedData<ActionPolicy<{ actions::KEYS_DELETE }>, AuthController>,
+    auth_controller: GuardedData<ActionPolicy<{ actions::KEYS_DELETE }>, Data<AuthController>>,
     path: web::Path<AuthParam>,
 ) -> Result<HttpResponse, ResponseError> {
     let key = path.into_inner().key;
diff --git a/meilisearch/src/routes/dump.rs b/meilisearch/src/routes/dump.rs
index 8e0e63776..0aabd2aa6 100644
--- a/meilisearch/src/routes/dump.rs
+++ b/meilisearch/src/routes/dump.rs
@@ -19,7 +19,7 @@ pub fn configure(cfg: &mut web::ServiceConfig) {
 
 pub async fn create_dump(
     index_scheduler: GuardedData<ActionPolicy<{ actions::DUMPS_CREATE }>, Data<IndexScheduler>>,
-    auth_controller: GuardedData<ActionPolicy<{ actions::DUMPS_CREATE }>, AuthController>,
+    auth_controller: GuardedData<ActionPolicy<{ actions::DUMPS_CREATE }>, Data<AuthController>>,
     req: HttpRequest,
     analytics: web::Data<dyn Analytics>,
 ) -> Result<HttpResponse, ResponseError> {
diff --git a/meilisearch/src/routes/indexes/mod.rs b/meilisearch/src/routes/indexes/mod.rs
index c5c168786..ba925b3d5 100644
--- a/meilisearch/src/routes/indexes/mod.rs
+++ b/meilisearch/src/routes/indexes/mod.rs
@@ -220,6 +220,28 @@ pub async fn delete_index(
     Ok(HttpResponse::Accepted().json(task))
 }
 
+/// Stats of an `Index`, as known to the `stats` route.
+#[derive(Serialize, Debug)]
+#[serde(rename_all = "camelCase")]
+pub struct IndexStats {
+    /// Number of documents in the index
+    pub number_of_documents: u64,
+    /// Whether the index is currently performing indexation, according to the scheduler.
+    pub is_indexing: bool,
+    /// Association of every field name with the number of times it occurs in the documents.
+    pub field_distribution: FieldDistribution,
+}
+
+impl From<index_scheduler::IndexStats> for IndexStats {
+    fn from(stats: index_scheduler::IndexStats) -> Self {
+        IndexStats {
+            number_of_documents: stats.inner_stats.number_of_documents,
+            is_indexing: stats.is_indexing,
+            field_distribution: stats.inner_stats.field_distribution,
+        }
+    }
+}
+
 pub async fn get_index_stats(
     index_scheduler: GuardedData<ActionPolicy<{ actions::STATS_GET }>, Data<IndexScheduler>>,
     index_uid: web::Path<String>,
@@ -229,33 +251,8 @@ pub async fn get_index_stats(
     let index_uid = IndexUid::try_from(index_uid.into_inner())?;
     analytics.publish("Stats Seen".to_string(), json!({ "per_index_uid": true }), Some(&req));
 
-    let stats = IndexStats::new((*index_scheduler).clone(), index_uid.into_inner())?;
+    let stats = IndexStats::from(index_scheduler.index_stats(&index_uid)?);
 
     debug!("returns: {:?}", stats);
     Ok(HttpResponse::Ok().json(stats))
 }
-
-#[derive(Serialize, Debug)]
-#[serde(rename_all = "camelCase")]
-pub struct IndexStats {
-    pub number_of_documents: u64,
-    pub is_indexing: bool,
-    pub field_distribution: FieldDistribution,
-}
-
-impl IndexStats {
-    pub fn new(
-        index_scheduler: Data<IndexScheduler>,
-        index_uid: String,
-    ) -> Result<Self, ResponseError> {
-        // we check if there is currently a task processing associated with this index.
-        let is_processing = index_scheduler.is_index_processing(&index_uid)?;
-        let index = index_scheduler.index(&index_uid)?;
-        let rtxn = index.read_txn()?;
-        Ok(IndexStats {
-            number_of_documents: index.number_of_documents(&rtxn)?,
-            is_indexing: is_processing,
-            field_distribution: index.field_distribution(&rtxn)?,
-        })
-    }
-}
diff --git a/meilisearch/src/routes/metrics.rs b/meilisearch/src/routes/metrics.rs
index 59cff9b58..874a1a5a5 100644
--- a/meilisearch/src/routes/metrics.rs
+++ b/meilisearch/src/routes/metrics.rs
@@ -17,7 +17,7 @@ pub fn configure(config: &mut web::ServiceConfig) {
 
 pub async fn get_metrics(
     index_scheduler: GuardedData<ActionPolicy<{ actions::METRICS_GET }>, Data<IndexScheduler>>,
-    auth_controller: GuardedData<ActionPolicy<{ actions::METRICS_GET }>, AuthController>,
+    auth_controller: GuardedData<ActionPolicy<{ actions::METRICS_GET }>, Data<AuthController>>,
 ) -> Result<HttpResponse, ResponseError> {
     let auth_filters = index_scheduler.filters();
     if !auth_filters.all_indexes_authorized() {
diff --git a/meilisearch/src/routes/mod.rs b/meilisearch/src/routes/mod.rs
index a4523e53f..51340ac1b 100644
--- a/meilisearch/src/routes/mod.rs
+++ b/meilisearch/src/routes/mod.rs
@@ -2,7 +2,7 @@ use std::collections::BTreeMap;
 
 use actix_web::web::Data;
 use actix_web::{web, HttpRequest, HttpResponse};
-use index_scheduler::{IndexScheduler, Query};
+use index_scheduler::IndexScheduler;
 use log::debug;
 use meilisearch_auth::AuthController;
 use meilisearch_types::error::ResponseError;
@@ -12,7 +12,6 @@ use serde::{Deserialize, Serialize};
 use serde_json::json;
 use time::OffsetDateTime;
 
-use self::indexes::IndexStats;
 use crate::analytics::Analytics;
 use crate::extractors::authentication::policies::*;
 use crate::extractors::authentication::GuardedData;
@@ -234,12 +233,12 @@ pub struct Stats {
     pub database_size: u64,
     #[serde(serialize_with = "time::serde::rfc3339::option::serialize")]
     pub last_update: Option<OffsetDateTime>,
-    pub indexes: BTreeMap<String, IndexStats>,
+    pub indexes: BTreeMap<String, indexes::IndexStats>,
 }
 
 async fn get_stats(
     index_scheduler: GuardedData<ActionPolicy<{ actions::STATS_GET }>, Data<IndexScheduler>>,
-    auth_controller: GuardedData<ActionPolicy<{ actions::STATS_GET }>, AuthController>,
+    auth_controller: GuardedData<ActionPolicy<{ actions::STATS_GET }>, Data<AuthController>>,
     req: HttpRequest,
     analytics: web::Data<dyn Analytics>,
 ) -> Result<HttpResponse, ResponseError> {
@@ -254,38 +253,29 @@ async fn get_stats(
 
 pub fn create_all_stats(
     index_scheduler: Data<IndexScheduler>,
-    auth_controller: AuthController,
+    auth_controller: Data<AuthController>,
     filters: &meilisearch_auth::AuthFilter,
 ) -> Result<Stats, ResponseError> {
     let mut last_task: Option<OffsetDateTime> = None;
     let mut indexes = BTreeMap::new();
     let mut database_size = 0;
-    let processing_task = index_scheduler.get_tasks_from_authorized_indexes(
-        Query { statuses: Some(vec![Status::Processing]), limit: Some(1), ..Query::default() },
-        filters,
-    )?;
-    // accumulate the size of each indexes
-    let processing_index = processing_task.first().and_then(|task| task.index_uid());
-    index_scheduler.try_for_each_index(|name, index| {
-        if !filters.is_index_authorized(name) {
-            return Ok(());
+
+    for index_uid in index_scheduler.index_names()? {
+        // Accumulate the size of all indexes, even unauthorized ones, so
+        // as to return a database_size representative of the correct database size on disk.
+        // See <https://github.com/meilisearch/meilisearch/pull/3541#discussion_r1126747643> for context.
+        let stats = index_scheduler.index_stats(&index_uid)?;
+        database_size += stats.inner_stats.database_size;
+
+        if !filters.is_index_authorized(&index_uid) {
+            continue;
         }
 
-        database_size += index.on_disk_size()?;
-
-        let rtxn = index.read_txn()?;
-        let stats = IndexStats {
-            number_of_documents: index.number_of_documents(&rtxn)?,
-            is_indexing: processing_index.map_or(false, |index_name| name == index_name),
-            field_distribution: index.field_distribution(&rtxn)?,
-        };
-
-        let updated_at = index.updated_at(&rtxn)?;
-        last_task = last_task.map_or(Some(updated_at), |last| Some(last.max(updated_at)));
-
-        indexes.insert(name.to_string(), stats);
-        Ok(())
-    })?;
+        last_task = last_task.map_or(Some(stats.inner_stats.updated_at), |last| {
+            Some(last.max(stats.inner_stats.updated_at))
+        });
+        indexes.insert(index_uid.to_string(), stats.into());
+    }
 
     database_size += index_scheduler.size()?;
     database_size += auth_controller.size()?;
@@ -328,9 +318,14 @@ struct KeysResponse {
 
 pub async fn get_health(
     req: HttpRequest,
+    index_scheduler: Data<IndexScheduler>,
+    auth_controller: Data<AuthController>,
     analytics: web::Data<dyn Analytics>,
 ) -> Result<HttpResponse, ResponseError> {
     analytics.health_seen(&req);
 
+    index_scheduler.health().unwrap();
+    auth_controller.health().unwrap();
+
     Ok(HttpResponse::Ok().json(serde_json::json!({ "status": "available" })))
 }
diff --git a/meilisearch/src/search.rs b/meilisearch/src/search.rs
index c287f1ba0..7e4a7da6a 100644
--- a/meilisearch/src/search.rs
+++ b/meilisearch/src/search.rs
@@ -375,10 +375,15 @@ pub fn perform_search(
         &displayed_ids,
     );
 
-    let mut tokenizer_buidler = TokenizerBuilder::default();
-    tokenizer_buidler.create_char_map(true);
+    let mut tokenizer_builder = TokenizerBuilder::default();
+    tokenizer_builder.create_char_map(true);
 
-    let mut formatter_builder = MatcherBuilder::new(matching_words, tokenizer_buidler.build());
+    let script_lang_map = index.script_language(&rtxn)?;
+    if !script_lang_map.is_empty() {
+        tokenizer_builder.allow_list(&script_lang_map);
+    }
+
+    let mut formatter_builder = MatcherBuilder::new(matching_words, tokenizer_builder.build());
     formatter_builder.crop_marker(query.crop_marker);
     formatter_builder.highlight_prefix(query.highlight_pre_tag);
     formatter_builder.highlight_suffix(query.highlight_post_tag);
diff --git a/meilisearch/tests/common/server.rs b/meilisearch/tests/common/server.rs
index d4cf6184d..66b82eace 100644
--- a/meilisearch/tests/common/server.rs
+++ b/meilisearch/tests/common/server.rs
@@ -82,7 +82,7 @@ impl Server {
     > {
         actix_web::test::init_service(create_app(
             self.service.index_scheduler.clone().into(),
-            self.service.auth.clone(),
+            self.service.auth.clone().into(),
             self.service.options.clone(),
             analytics::MockAnalytics::new(&self.service.options),
             true,
diff --git a/meilisearch/tests/common/service.rs b/meilisearch/tests/common/service.rs
index c6ac65418..2ff474157 100644
--- a/meilisearch/tests/common/service.rs
+++ b/meilisearch/tests/common/service.rs
@@ -13,7 +13,7 @@ use crate::common::encoder::Encoder;
 
 pub struct Service {
     pub index_scheduler: Arc<IndexScheduler>,
-    pub auth: AuthController,
+    pub auth: Arc<AuthController>,
     pub options: Opt,
     pub api_key: Option<String>,
 }
@@ -107,7 +107,7 @@ impl Service {
     pub async fn request(&self, mut req: test::TestRequest) -> (Value, StatusCode) {
         let app = test::init_service(create_app(
             self.index_scheduler.clone().into(),
-            self.auth.clone(),
+            self.auth.clone().into(),
             self.options.clone(),
             analytics::MockAnalytics::new(&self.options),
             true,
diff --git a/meilisearch/tests/dumps/mod.rs b/meilisearch/tests/dumps/mod.rs
index cbc895f32..31fa49b60 100644
--- a/meilisearch/tests/dumps/mod.rs
+++ b/meilisearch/tests/dumps/mod.rs
@@ -1,5 +1,6 @@
 mod data;
 
+use meili_snap::{json_string, snapshot};
 use meilisearch::Opt;
 use serde_json::json;
 
@@ -66,6 +67,35 @@ async fn import_dump_v1_movie_raw() {
         document,
         json!({"id": 10006, "title": "Wild Seven", "overview": "In this darkly karmic vision of Arizona, a man who breathes nothing but ill will begins a noxious domino effect as quickly as an uncontrollable virus kills. As he exits Arizona State Penn after twenty-one long years, Wilson has only one thing on the brain, leveling the score with career criminal, Mackey Willis.", "genres": ["Action", "Crime", "Drama"], "poster": "https://image.tmdb.org/t/p/w500/y114dTPoqn8k2Txps4P2tI95YCS.jpg", "release_date": 1136073600})
     );
+
+    // We're going to ensure that every reverse index of the task queue has been well built while importing the dump
+    let (tasks, code) = server.tasks_filter("uids=0&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("types=documentAdditionOrUpdate&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("statuses=succeeded&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("indexUids=indexUID&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("afterEnqueuedAt=2021-09-05&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("afterStartedAt=2021-09-06&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("afterFinishedAt=2021-09-07&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
 }
 
 #[actix_rt::test]
@@ -129,6 +159,35 @@ async fn import_dump_v1_movie_with_settings() {
         document,
         json!({ "id": 10006, "title": "Wild Seven", "genres": ["Action", "Crime", "Drama"], "overview": "In this darkly karmic vision of Arizona, a man who breathes nothing but ill will begins a noxious domino effect as quickly as an uncontrollable virus kills. As he exits Arizona State Penn after twenty-one long years, Wilson has only one thing on the brain, leveling the score with career criminal, Mackey Willis.", "poster": "https://image.tmdb.org/t/p/w500/y114dTPoqn8k2Txps4P2tI95YCS.jpg", "release_date": 1136073600})
     );
+
+    // We're going to ensure that every reverse index of the task queue has been well built while importing the dump
+    let (tasks, code) = server.tasks_filter("uids=0&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("types=documentAdditionOrUpdate&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("statuses=succeeded&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("indexUids=indexUID&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("afterEnqueuedAt=2021-09-05&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("afterStartedAt=2021-09-06&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("afterFinishedAt=2021-09-07&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
 }
 
 #[actix_rt::test]
@@ -192,6 +251,35 @@ async fn import_dump_v1_rubygems_with_settings() {
         document,
         json!({ "name": "vortex-of-agony", "summary": "You dont need to use nodejs or go, just install this plugin. It will crash your application at random", "description": "You dont need to use nodejs or go, just install this plugin. It will crash your application at random", "id": "159227", "version": "0.1.0", "total_downloads": "1007"})
     );
+
+    // We're going to ensure that every reverse index of the task queue has been well built while importing the dump
+    let (tasks, code) = server.tasks_filter("uids=0&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("types=documentAdditionOrUpdate&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("statuses=succeeded&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("indexUids=rubygems&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("afterEnqueuedAt=2021-09-05&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("afterStartedAt=2021-09-06&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("afterFinishedAt=2021-09-07&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
 }
 
 #[actix_rt::test]
@@ -253,6 +341,35 @@ async fn import_dump_v2_movie_raw() {
         document,
         json!({"id": 10006, "title": "Wild Seven", "overview": "In this darkly karmic vision of Arizona, a man who breathes nothing but ill will begins a noxious domino effect as quickly as an uncontrollable virus kills. As he exits Arizona State Penn after twenty-one long years, Wilson has only one thing on the brain, leveling the score with career criminal, Mackey Willis.", "genres": ["Action", "Crime", "Drama"], "poster": "https://image.tmdb.org/t/p/w500/y114dTPoqn8k2Txps4P2tI95YCS.jpg", "release_date": 1136073600})
     );
+
+    // We're going to ensure that every reverse index of the task queue has been well built while importing the dump
+    let (tasks, code) = server.tasks_filter("uids=0&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("types=documentAdditionOrUpdate&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("statuses=succeeded&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("indexUids=indexUID&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("afterEnqueuedAt=2021-09-05&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("afterStartedAt=2021-09-06&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("afterFinishedAt=2021-09-07&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
 }
 
 #[actix_rt::test]
@@ -316,6 +433,35 @@ async fn import_dump_v2_movie_with_settings() {
         document,
         json!({ "id": 10006, "title": "Wild Seven", "genres": ["Action", "Crime", "Drama"], "overview": "In this darkly karmic vision of Arizona, a man who breathes nothing but ill will begins a noxious domino effect as quickly as an uncontrollable virus kills. As he exits Arizona State Penn after twenty-one long years, Wilson has only one thing on the brain, leveling the score with career criminal, Mackey Willis.", "poster": "https://image.tmdb.org/t/p/w500/y114dTPoqn8k2Txps4P2tI95YCS.jpg", "release_date": 1136073600})
     );
+
+    // We're going to ensure that every reverse index of the task queue has been well built while importing the dump
+    let (tasks, code) = server.tasks_filter("uids=0&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("types=documentAdditionOrUpdate&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("statuses=succeeded&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("indexUids=indexUID&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("afterEnqueuedAt=2021-09-05&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("afterStartedAt=2021-09-06&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("afterFinishedAt=2021-09-07&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
 }
 
 #[actix_rt::test]
@@ -379,6 +525,35 @@ async fn import_dump_v2_rubygems_with_settings() {
         document,
         json!({ "name": "vortex-of-agony", "summary": "You dont need to use nodejs or go, just install this plugin. It will crash your application at random", "description": "You dont need to use nodejs or go, just install this plugin. It will crash your application at random", "id": "159227", "version": "0.1.0", "total_downloads": "1007"})
     );
+
+    // We're going to ensure that every reverse index of the task queue has been well built while importing the dump
+    let (tasks, code) = server.tasks_filter("uids=0&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("types=documentAdditionOrUpdate&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("statuses=succeeded&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("indexUids=rubygems&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("afterEnqueuedAt=2021-09-05&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("afterStartedAt=2021-09-06&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("afterFinishedAt=2021-09-07&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
 }
 
 #[actix_rt::test]
@@ -440,6 +615,35 @@ async fn import_dump_v3_movie_raw() {
         document,
         json!({"id": 10006, "title": "Wild Seven", "overview": "In this darkly karmic vision of Arizona, a man who breathes nothing but ill will begins a noxious domino effect as quickly as an uncontrollable virus kills. As he exits Arizona State Penn after twenty-one long years, Wilson has only one thing on the brain, leveling the score with career criminal, Mackey Willis.", "genres": ["Action", "Crime", "Drama"], "poster": "https://image.tmdb.org/t/p/w500/y114dTPoqn8k2Txps4P2tI95YCS.jpg", "release_date": 1136073600})
     );
+
+    // We're going to ensure that every reverse index of the task queue has been well built while importing the dump
+    let (tasks, code) = server.tasks_filter("uids=0&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("types=documentAdditionOrUpdate&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("statuses=succeeded&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("indexUids=indexUID&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("afterEnqueuedAt=2021-09-05&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("afterStartedAt=2021-09-06&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("afterFinishedAt=2021-09-07&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
 }
 
 #[actix_rt::test]
@@ -503,6 +707,35 @@ async fn import_dump_v3_movie_with_settings() {
         document,
         json!({ "id": 10006, "title": "Wild Seven", "genres": ["Action", "Crime", "Drama"], "overview": "In this darkly karmic vision of Arizona, a man who breathes nothing but ill will begins a noxious domino effect as quickly as an uncontrollable virus kills. As he exits Arizona State Penn after twenty-one long years, Wilson has only one thing on the brain, leveling the score with career criminal, Mackey Willis.", "poster": "https://image.tmdb.org/t/p/w500/y114dTPoqn8k2Txps4P2tI95YCS.jpg", "release_date": 1136073600})
     );
+
+    // We're going to ensure that every reverse index of the task queue has been well built while importing the dump
+    let (tasks, code) = server.tasks_filter("uids=0&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("types=documentAdditionOrUpdate&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("statuses=succeeded&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("indexUids=indexUID&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("afterEnqueuedAt=2021-09-05&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("afterStartedAt=2021-09-06&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("afterFinishedAt=2021-09-07&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
 }
 
 #[actix_rt::test]
@@ -566,6 +799,35 @@ async fn import_dump_v3_rubygems_with_settings() {
         document,
         json!({ "name": "vortex-of-agony", "summary": "You dont need to use nodejs or go, just install this plugin. It will crash your application at random", "description": "You dont need to use nodejs or go, just install this plugin. It will crash your application at random", "id": "159227", "version": "0.1.0", "total_downloads": "1007"})
     );
+
+    // We're going to ensure that every reverse index of the task queue has been well built while importing the dump
+    let (tasks, code) = server.tasks_filter("uids=0&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("types=documentAdditionOrUpdate&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("statuses=succeeded&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("indexUids=rubygems&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("afterEnqueuedAt=2021-09-05&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("afterStartedAt=2021-09-06&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("afterFinishedAt=2021-09-07&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
 }
 
 #[actix_rt::test]
@@ -627,6 +889,35 @@ async fn import_dump_v4_movie_raw() {
         document,
         json!({ "id": 10006, "title": "Wild Seven", "overview": "In this darkly karmic vision of Arizona, a man who breathes nothing but ill will begins a noxious domino effect as quickly as an uncontrollable virus kills. As he exits Arizona State Penn after twenty-one long years, Wilson has only one thing on the brain, leveling the score with career criminal, Mackey Willis.", "genres": ["Action", "Crime", "Drama"], "poster": "https://image.tmdb.org/t/p/w500/y114dTPoqn8k2Txps4P2tI95YCS.jpg", "release_date": 1136073600})
     );
+
+    // We're going to ensure that every reverse index of the task queue has been well built while importing the dump
+    let (tasks, code) = server.tasks_filter("uids=0&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("types=documentAdditionOrUpdate&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("statuses=succeeded&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("indexUids=indexUID&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("afterEnqueuedAt=2021-09-05&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("afterStartedAt=2021-09-06&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("afterFinishedAt=2021-09-07&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
 }
 
 #[actix_rt::test]
@@ -690,6 +981,35 @@ async fn import_dump_v4_movie_with_settings() {
         document,
         json!({ "id": 10006, "title": "Wild Seven", "genres": ["Action", "Crime", "Drama"], "overview": "In this darkly karmic vision of Arizona, a man who breathes nothing but ill will begins a noxious domino effect as quickly as an uncontrollable virus kills. As he exits Arizona State Penn after twenty-one long years, Wilson has only one thing on the brain, leveling the score with career criminal, Mackey Willis.", "poster": "https://image.tmdb.org/t/p/w500/y114dTPoqn8k2Txps4P2tI95YCS.jpg", "release_date": 1136073600})
     );
+
+    // We're going to ensure that every reverse index of the task queue has been well built while importing the dump
+    let (tasks, code) = server.tasks_filter("uids=0&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("types=documentAdditionOrUpdate&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("statuses=succeeded&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("indexUids=indexUID&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("afterEnqueuedAt=2021-09-05&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("afterStartedAt=2021-09-06&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("afterFinishedAt=2021-09-07&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
 }
 
 #[actix_rt::test]
@@ -753,6 +1073,35 @@ async fn import_dump_v4_rubygems_with_settings() {
         document,
         json!({ "name": "vortex-of-agony", "summary": "You dont need to use nodejs or go, just install this plugin. It will crash your application at random", "description": "You dont need to use nodejs or go, just install this plugin. It will crash your application at random", "id": "159227", "version": "0.1.0", "total_downloads": "1007"})
     );
+
+    // We're going to ensure that every reverse index of the task queue has been well built while importing the dump
+    let (tasks, code) = server.tasks_filter("uids=0&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("types=documentAdditionOrUpdate&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("statuses=succeeded&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("indexUids=rubygems&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("afterEnqueuedAt=2021-09-05&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("afterStartedAt=2021-09-06&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("afterFinishedAt=2021-09-07&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
 }
 
 #[actix_rt::test]
@@ -772,6 +1121,12 @@ async fn import_dump_v5() {
     assert_eq!(indexes["results"][1]["uid"], json!("test2"));
     assert_eq!(indexes["results"][0]["primaryKey"], json!("id"));
 
+    // before doing anything we're going to wait until all the tasks in the dump have finished processing
+    let result = server.tasks_filter("statuses=enqueued,processing").await.0;
+    for task in result["results"].as_array().unwrap() {
+        server.wait_task(task["uid"].as_u64().unwrap()).await;
+    }
+
     let expected_stats = json!({
         "numberOfDocuments": 10,
         "isIndexing": false,
@@ -816,4 +1171,43 @@ async fn import_dump_v5() {
     let key = &keys["results"][0];
 
     assert_eq!(key["name"], "my key");
+
+    // We're going to ensure that every reverse index of the task queue has been well built while importing the dump
+    let (tasks, code) = server.tasks_filter("uids=0&limit=1&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("types=documentAdditionOrUpdate&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(json_string!(tasks));
+
+    let (tasks, code) = server.tasks_filter("statuses=succeeded&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(
+        json_string!(tasks, { ".results[].details.dumpUid" => "[uid]",  ".results[].duration" => "[duration]" ,  ".results[].startedAt" => "[date]" ,  ".results[].finishedAt" => "[date]"  })
+    );
+
+    let (tasks, code) = server.tasks_filter("indexUids=test&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(
+        json_string!(tasks, { ".results[].details.dumpUid" => "[uid]",  ".results[].duration" => "[duration]" ,  ".results[].startedAt" => "[date]" ,  ".results[].finishedAt" => "[date]"  })
+    );
+
+    let (tasks, code) = server.tasks_filter("afterEnqueuedAt=2021-09-05&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(
+        json_string!(tasks, { ".results[].details.dumpUid" => "[uid]",  ".results[].duration" => "[duration]" ,  ".results[].startedAt" => "[date]" ,  ".results[].finishedAt" => "[date]"  })
+    );
+
+    let (tasks, code) = server.tasks_filter("afterStartedAt=2021-09-06&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(
+        json_string!(tasks, { ".results[].details.dumpUid" => "[uid]",  ".results[].duration" => "[duration]" ,  ".results[].startedAt" => "[date]" ,  ".results[].finishedAt" => "[date]"  })
+    );
+
+    let (tasks, code) = server.tasks_filter("afterFinishedAt=2021-09-07&limit=1").await;
+    snapshot!(code, @"200 OK");
+    snapshot!(
+        json_string!(tasks, { ".results[].details.dumpUid" => "[uid]",  ".results[].duration" => "[duration]" ,  ".results[].startedAt" => "[date]" ,  ".results[].finishedAt" => "[date]"  })
+    );
 }
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/1.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/1.snap
new file mode 100644
index 000000000..f062ee002
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/1.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 0,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 31968
+      },
+      "error": null,
+      "duration": "PT9.317060500S",
+      "enqueuedAt": "2021-09-08T09:08:45.153219Z",
+      "startedAt": "2021-09-08T09:08:45.3961665Z",
+      "finishedAt": "2021-09-08T09:08:54.713227Z"
+    }
+  ],
+  "limit": 1,
+  "from": 0,
+  "next": null
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/2.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/2.snap
new file mode 100644
index 000000000..f062ee002
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/2.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 0,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 31968
+      },
+      "error": null,
+      "duration": "PT9.317060500S",
+      "enqueuedAt": "2021-09-08T09:08:45.153219Z",
+      "startedAt": "2021-09-08T09:08:45.3961665Z",
+      "finishedAt": "2021-09-08T09:08:54.713227Z"
+    }
+  ],
+  "limit": 1,
+  "from": 0,
+  "next": null
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/3.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/3.snap
new file mode 100644
index 000000000..f062ee002
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/3.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 0,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 31968
+      },
+      "error": null,
+      "duration": "PT9.317060500S",
+      "enqueuedAt": "2021-09-08T09:08:45.153219Z",
+      "startedAt": "2021-09-08T09:08:45.3961665Z",
+      "finishedAt": "2021-09-08T09:08:54.713227Z"
+    }
+  ],
+  "limit": 1,
+  "from": 0,
+  "next": null
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/4.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/4.snap
new file mode 100644
index 000000000..f062ee002
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/4.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 0,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 31968
+      },
+      "error": null,
+      "duration": "PT9.317060500S",
+      "enqueuedAt": "2021-09-08T09:08:45.153219Z",
+      "startedAt": "2021-09-08T09:08:45.3961665Z",
+      "finishedAt": "2021-09-08T09:08:54.713227Z"
+    }
+  ],
+  "limit": 1,
+  "from": 0,
+  "next": null
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/5.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/5.snap
new file mode 100644
index 000000000..f062ee002
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/5.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 0,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 31968
+      },
+      "error": null,
+      "duration": "PT9.317060500S",
+      "enqueuedAt": "2021-09-08T09:08:45.153219Z",
+      "startedAt": "2021-09-08T09:08:45.3961665Z",
+      "finishedAt": "2021-09-08T09:08:54.713227Z"
+    }
+  ],
+  "limit": 1,
+  "from": 0,
+  "next": null
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/6.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/6.snap
new file mode 100644
index 000000000..f062ee002
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/6.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 0,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 31968
+      },
+      "error": null,
+      "duration": "PT9.317060500S",
+      "enqueuedAt": "2021-09-08T09:08:45.153219Z",
+      "startedAt": "2021-09-08T09:08:45.3961665Z",
+      "finishedAt": "2021-09-08T09:08:54.713227Z"
+    }
+  ],
+  "limit": 1,
+  "from": 0,
+  "next": null
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/7.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/7.snap
new file mode 100644
index 000000000..f062ee002
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_raw/7.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 0,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 31968
+      },
+      "error": null,
+      "duration": "PT9.317060500S",
+      "enqueuedAt": "2021-09-08T09:08:45.153219Z",
+      "startedAt": "2021-09-08T09:08:45.3961665Z",
+      "finishedAt": "2021-09-08T09:08:54.713227Z"
+    }
+  ],
+  "limit": 1,
+  "from": 0,
+  "next": null
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/1.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/1.snap
new file mode 100644
index 000000000..986b71132
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/1.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 0,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 31968
+      },
+      "error": null,
+      "duration": "PT9.090735774S",
+      "enqueuedAt": "2021-09-08T09:34:16.036101Z",
+      "startedAt": "2021-09-08T09:34:16.261191226Z",
+      "finishedAt": "2021-09-08T09:34:25.351927Z"
+    }
+  ],
+  "limit": 1,
+  "from": 0,
+  "next": null
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/2.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/2.snap
new file mode 100644
index 000000000..986b71132
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/2.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 0,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 31968
+      },
+      "error": null,
+      "duration": "PT9.090735774S",
+      "enqueuedAt": "2021-09-08T09:34:16.036101Z",
+      "startedAt": "2021-09-08T09:34:16.261191226Z",
+      "finishedAt": "2021-09-08T09:34:25.351927Z"
+    }
+  ],
+  "limit": 1,
+  "from": 0,
+  "next": null
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/3.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/3.snap
new file mode 100644
index 000000000..e2e059fac
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/3.snap
@@ -0,0 +1,46 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 1,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "settingsUpdate",
+      "canceledBy": null,
+      "details": {
+        "displayedAttributes": [
+          "genres",
+          "id",
+          "overview",
+          "poster",
+          "release_date",
+          "title"
+        ],
+        "searchableAttributes": [
+          "title",
+          "overview"
+        ],
+        "filterableAttributes": [
+          "genres"
+        ],
+        "sortableAttributes": [
+          "genres"
+        ],
+        "stopWords": [
+          "of",
+          "the"
+        ]
+      },
+      "error": null,
+      "duration": "PT7.288826907S",
+      "enqueuedAt": "2021-09-08T09:34:40.882977Z",
+      "startedAt": "2021-09-08T09:34:40.883073093Z",
+      "finishedAt": "2021-09-08T09:34:48.1719Z"
+    }
+  ],
+  "limit": 1,
+  "from": 1,
+  "next": 0
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/4.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/4.snap
new file mode 100644
index 000000000..e2e059fac
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/4.snap
@@ -0,0 +1,46 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 1,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "settingsUpdate",
+      "canceledBy": null,
+      "details": {
+        "displayedAttributes": [
+          "genres",
+          "id",
+          "overview",
+          "poster",
+          "release_date",
+          "title"
+        ],
+        "searchableAttributes": [
+          "title",
+          "overview"
+        ],
+        "filterableAttributes": [
+          "genres"
+        ],
+        "sortableAttributes": [
+          "genres"
+        ],
+        "stopWords": [
+          "of",
+          "the"
+        ]
+      },
+      "error": null,
+      "duration": "PT7.288826907S",
+      "enqueuedAt": "2021-09-08T09:34:40.882977Z",
+      "startedAt": "2021-09-08T09:34:40.883073093Z",
+      "finishedAt": "2021-09-08T09:34:48.1719Z"
+    }
+  ],
+  "limit": 1,
+  "from": 1,
+  "next": 0
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/5.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/5.snap
new file mode 100644
index 000000000..e2e059fac
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/5.snap
@@ -0,0 +1,46 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 1,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "settingsUpdate",
+      "canceledBy": null,
+      "details": {
+        "displayedAttributes": [
+          "genres",
+          "id",
+          "overview",
+          "poster",
+          "release_date",
+          "title"
+        ],
+        "searchableAttributes": [
+          "title",
+          "overview"
+        ],
+        "filterableAttributes": [
+          "genres"
+        ],
+        "sortableAttributes": [
+          "genres"
+        ],
+        "stopWords": [
+          "of",
+          "the"
+        ]
+      },
+      "error": null,
+      "duration": "PT7.288826907S",
+      "enqueuedAt": "2021-09-08T09:34:40.882977Z",
+      "startedAt": "2021-09-08T09:34:40.883073093Z",
+      "finishedAt": "2021-09-08T09:34:48.1719Z"
+    }
+  ],
+  "limit": 1,
+  "from": 1,
+  "next": 0
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/6.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/6.snap
new file mode 100644
index 000000000..e2e059fac
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/6.snap
@@ -0,0 +1,46 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 1,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "settingsUpdate",
+      "canceledBy": null,
+      "details": {
+        "displayedAttributes": [
+          "genres",
+          "id",
+          "overview",
+          "poster",
+          "release_date",
+          "title"
+        ],
+        "searchableAttributes": [
+          "title",
+          "overview"
+        ],
+        "filterableAttributes": [
+          "genres"
+        ],
+        "sortableAttributes": [
+          "genres"
+        ],
+        "stopWords": [
+          "of",
+          "the"
+        ]
+      },
+      "error": null,
+      "duration": "PT7.288826907S",
+      "enqueuedAt": "2021-09-08T09:34:40.882977Z",
+      "startedAt": "2021-09-08T09:34:40.883073093Z",
+      "finishedAt": "2021-09-08T09:34:48.1719Z"
+    }
+  ],
+  "limit": 1,
+  "from": 1,
+  "next": 0
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/7.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/7.snap
new file mode 100644
index 000000000..e2e059fac
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_movie_with_settings/7.snap
@@ -0,0 +1,46 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 1,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "settingsUpdate",
+      "canceledBy": null,
+      "details": {
+        "displayedAttributes": [
+          "genres",
+          "id",
+          "overview",
+          "poster",
+          "release_date",
+          "title"
+        ],
+        "searchableAttributes": [
+          "title",
+          "overview"
+        ],
+        "filterableAttributes": [
+          "genres"
+        ],
+        "sortableAttributes": [
+          "genres"
+        ],
+        "stopWords": [
+          "of",
+          "the"
+        ]
+      },
+      "error": null,
+      "duration": "PT7.288826907S",
+      "enqueuedAt": "2021-09-08T09:34:40.882977Z",
+      "startedAt": "2021-09-08T09:34:40.883073093Z",
+      "finishedAt": "2021-09-08T09:34:48.1719Z"
+    }
+  ],
+  "limit": 1,
+  "from": 1,
+  "next": 0
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/1.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/1.snap
new file mode 100644
index 000000000..84a9c4fd5
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/1.snap
@@ -0,0 +1,51 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 0,
+      "indexUid": "rubygems",
+      "status": "succeeded",
+      "type": "settingsUpdate",
+      "canceledBy": null,
+      "details": {
+        "displayedAttributes": [
+          "description",
+          "id",
+          "name",
+          "summary",
+          "total_downloads",
+          "version"
+        ],
+        "searchableAttributes": [
+          "name",
+          "summary"
+        ],
+        "filterableAttributes": [
+          "version"
+        ],
+        "sortableAttributes": [
+          "version"
+        ],
+        "rankingRules": [
+          "typo",
+          "words",
+          "fame:desc",
+          "proximity",
+          "attribute",
+          "exactness",
+          "total_downloads:desc"
+        ]
+      },
+      "error": null,
+      "duration": "PT0.000988440S",
+      "enqueuedAt": "2021-09-08T09:26:57.317704Z",
+      "startedAt": "2021-09-08T09:26:57.31809456Z",
+      "finishedAt": "2021-09-08T09:26:57.319083Z"
+    }
+  ],
+  "limit": 1,
+  "from": 0,
+  "next": null
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/2.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/2.snap
new file mode 100644
index 000000000..fa8a9305b
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/2.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 92,
+      "indexUid": "rubygems",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 1042
+      },
+      "error": null,
+      "duration": "PT1.487793839S",
+      "enqueuedAt": "2021-09-08T09:27:01.465296Z",
+      "startedAt": "2021-09-08T09:28:44.882177161Z",
+      "finishedAt": "2021-09-08T09:28:46.369971Z"
+    }
+  ],
+  "limit": 1,
+  "from": 92,
+  "next": 91
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/3.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/3.snap
new file mode 100644
index 000000000..fa8a9305b
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/3.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 92,
+      "indexUid": "rubygems",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 1042
+      },
+      "error": null,
+      "duration": "PT1.487793839S",
+      "enqueuedAt": "2021-09-08T09:27:01.465296Z",
+      "startedAt": "2021-09-08T09:28:44.882177161Z",
+      "finishedAt": "2021-09-08T09:28:46.369971Z"
+    }
+  ],
+  "limit": 1,
+  "from": 92,
+  "next": 91
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/4.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/4.snap
new file mode 100644
index 000000000..fa8a9305b
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/4.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 92,
+      "indexUid": "rubygems",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 1042
+      },
+      "error": null,
+      "duration": "PT1.487793839S",
+      "enqueuedAt": "2021-09-08T09:27:01.465296Z",
+      "startedAt": "2021-09-08T09:28:44.882177161Z",
+      "finishedAt": "2021-09-08T09:28:46.369971Z"
+    }
+  ],
+  "limit": 1,
+  "from": 92,
+  "next": 91
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/5.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/5.snap
new file mode 100644
index 000000000..fa8a9305b
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/5.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 92,
+      "indexUid": "rubygems",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 1042
+      },
+      "error": null,
+      "duration": "PT1.487793839S",
+      "enqueuedAt": "2021-09-08T09:27:01.465296Z",
+      "startedAt": "2021-09-08T09:28:44.882177161Z",
+      "finishedAt": "2021-09-08T09:28:46.369971Z"
+    }
+  ],
+  "limit": 1,
+  "from": 92,
+  "next": 91
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/6.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/6.snap
new file mode 100644
index 000000000..fa8a9305b
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/6.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 92,
+      "indexUid": "rubygems",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 1042
+      },
+      "error": null,
+      "duration": "PT1.487793839S",
+      "enqueuedAt": "2021-09-08T09:27:01.465296Z",
+      "startedAt": "2021-09-08T09:28:44.882177161Z",
+      "finishedAt": "2021-09-08T09:28:46.369971Z"
+    }
+  ],
+  "limit": 1,
+  "from": 92,
+  "next": 91
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/7.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/7.snap
new file mode 100644
index 000000000..fa8a9305b
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v1_rubygems_with_settings/7.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 92,
+      "indexUid": "rubygems",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 1042
+      },
+      "error": null,
+      "duration": "PT1.487793839S",
+      "enqueuedAt": "2021-09-08T09:27:01.465296Z",
+      "startedAt": "2021-09-08T09:28:44.882177161Z",
+      "finishedAt": "2021-09-08T09:28:46.369971Z"
+    }
+  ],
+  "limit": 1,
+  "from": 92,
+  "next": 91
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/1.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/1.snap
new file mode 100644
index 000000000..6fb6c0e80
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/1.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 0,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 31944
+      },
+      "error": null,
+      "duration": "PT41.751156S",
+      "enqueuedAt": "2021-09-08T08:30:30.550282Z",
+      "startedAt": "2021-09-08T08:30:30.553012Z",
+      "finishedAt": "2021-09-08T08:31:12.304168Z"
+    }
+  ],
+  "limit": 1,
+  "from": 0,
+  "next": null
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/2.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/2.snap
new file mode 100644
index 000000000..6fb6c0e80
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/2.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 0,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 31944
+      },
+      "error": null,
+      "duration": "PT41.751156S",
+      "enqueuedAt": "2021-09-08T08:30:30.550282Z",
+      "startedAt": "2021-09-08T08:30:30.553012Z",
+      "finishedAt": "2021-09-08T08:31:12.304168Z"
+    }
+  ],
+  "limit": 1,
+  "from": 0,
+  "next": null
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/3.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/3.snap
new file mode 100644
index 000000000..6fb6c0e80
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/3.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 0,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 31944
+      },
+      "error": null,
+      "duration": "PT41.751156S",
+      "enqueuedAt": "2021-09-08T08:30:30.550282Z",
+      "startedAt": "2021-09-08T08:30:30.553012Z",
+      "finishedAt": "2021-09-08T08:31:12.304168Z"
+    }
+  ],
+  "limit": 1,
+  "from": 0,
+  "next": null
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/4.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/4.snap
new file mode 100644
index 000000000..6fb6c0e80
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/4.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 0,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 31944
+      },
+      "error": null,
+      "duration": "PT41.751156S",
+      "enqueuedAt": "2021-09-08T08:30:30.550282Z",
+      "startedAt": "2021-09-08T08:30:30.553012Z",
+      "finishedAt": "2021-09-08T08:31:12.304168Z"
+    }
+  ],
+  "limit": 1,
+  "from": 0,
+  "next": null
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/5.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/5.snap
new file mode 100644
index 000000000..6fb6c0e80
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/5.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 0,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 31944
+      },
+      "error": null,
+      "duration": "PT41.751156S",
+      "enqueuedAt": "2021-09-08T08:30:30.550282Z",
+      "startedAt": "2021-09-08T08:30:30.553012Z",
+      "finishedAt": "2021-09-08T08:31:12.304168Z"
+    }
+  ],
+  "limit": 1,
+  "from": 0,
+  "next": null
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/6.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/6.snap
new file mode 100644
index 000000000..6fb6c0e80
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/6.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 0,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 31944
+      },
+      "error": null,
+      "duration": "PT41.751156S",
+      "enqueuedAt": "2021-09-08T08:30:30.550282Z",
+      "startedAt": "2021-09-08T08:30:30.553012Z",
+      "finishedAt": "2021-09-08T08:31:12.304168Z"
+    }
+  ],
+  "limit": 1,
+  "from": 0,
+  "next": null
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/7.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/7.snap
new file mode 100644
index 000000000..6fb6c0e80
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_raw/7.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 0,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 31944
+      },
+      "error": null,
+      "duration": "PT41.751156S",
+      "enqueuedAt": "2021-09-08T08:30:30.550282Z",
+      "startedAt": "2021-09-08T08:30:30.553012Z",
+      "finishedAt": "2021-09-08T08:31:12.304168Z"
+    }
+  ],
+  "limit": 1,
+  "from": 0,
+  "next": null
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/1.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/1.snap
new file mode 100644
index 000000000..17dc6a4ee
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/1.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 0,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 31944
+      },
+      "error": null,
+      "duration": "PT39.941318S",
+      "enqueuedAt": "2021-09-08T08:21:14.742672Z",
+      "startedAt": "2021-09-08T08:21:14.750166Z",
+      "finishedAt": "2021-09-08T08:21:54.691484Z"
+    }
+  ],
+  "limit": 1,
+  "from": 0,
+  "next": null
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/2.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/2.snap
new file mode 100644
index 000000000..17dc6a4ee
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/2.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 0,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 31944
+      },
+      "error": null,
+      "duration": "PT39.941318S",
+      "enqueuedAt": "2021-09-08T08:21:14.742672Z",
+      "startedAt": "2021-09-08T08:21:14.750166Z",
+      "finishedAt": "2021-09-08T08:21:54.691484Z"
+    }
+  ],
+  "limit": 1,
+  "from": 0,
+  "next": null
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/3.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/3.snap
new file mode 100644
index 000000000..4253f1d0e
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/3.snap
@@ -0,0 +1,42 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 1,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "settingsUpdate",
+      "canceledBy": null,
+      "details": {
+        "displayedAttributes": [
+          "title",
+          "genres",
+          "overview",
+          "poster",
+          "release_date"
+        ],
+        "searchableAttributes": [
+          "title",
+          "overview"
+        ],
+        "filterableAttributes": [
+          "genres"
+        ],
+        "stopWords": [
+          "of",
+          "the"
+        ]
+      },
+      "error": null,
+      "duration": "PT37.488777S",
+      "enqueuedAt": "2021-09-08T08:24:02.323444Z",
+      "startedAt": "2021-09-08T08:24:02.324145Z",
+      "finishedAt": "2021-09-08T08:24:39.812922Z"
+    }
+  ],
+  "limit": 1,
+  "from": 1,
+  "next": 0
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/4.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/4.snap
new file mode 100644
index 000000000..4253f1d0e
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/4.snap
@@ -0,0 +1,42 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 1,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "settingsUpdate",
+      "canceledBy": null,
+      "details": {
+        "displayedAttributes": [
+          "title",
+          "genres",
+          "overview",
+          "poster",
+          "release_date"
+        ],
+        "searchableAttributes": [
+          "title",
+          "overview"
+        ],
+        "filterableAttributes": [
+          "genres"
+        ],
+        "stopWords": [
+          "of",
+          "the"
+        ]
+      },
+      "error": null,
+      "duration": "PT37.488777S",
+      "enqueuedAt": "2021-09-08T08:24:02.323444Z",
+      "startedAt": "2021-09-08T08:24:02.324145Z",
+      "finishedAt": "2021-09-08T08:24:39.812922Z"
+    }
+  ],
+  "limit": 1,
+  "from": 1,
+  "next": 0
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/5.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/5.snap
new file mode 100644
index 000000000..4253f1d0e
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/5.snap
@@ -0,0 +1,42 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 1,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "settingsUpdate",
+      "canceledBy": null,
+      "details": {
+        "displayedAttributes": [
+          "title",
+          "genres",
+          "overview",
+          "poster",
+          "release_date"
+        ],
+        "searchableAttributes": [
+          "title",
+          "overview"
+        ],
+        "filterableAttributes": [
+          "genres"
+        ],
+        "stopWords": [
+          "of",
+          "the"
+        ]
+      },
+      "error": null,
+      "duration": "PT37.488777S",
+      "enqueuedAt": "2021-09-08T08:24:02.323444Z",
+      "startedAt": "2021-09-08T08:24:02.324145Z",
+      "finishedAt": "2021-09-08T08:24:39.812922Z"
+    }
+  ],
+  "limit": 1,
+  "from": 1,
+  "next": 0
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/6.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/6.snap
new file mode 100644
index 000000000..4253f1d0e
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/6.snap
@@ -0,0 +1,42 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 1,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "settingsUpdate",
+      "canceledBy": null,
+      "details": {
+        "displayedAttributes": [
+          "title",
+          "genres",
+          "overview",
+          "poster",
+          "release_date"
+        ],
+        "searchableAttributes": [
+          "title",
+          "overview"
+        ],
+        "filterableAttributes": [
+          "genres"
+        ],
+        "stopWords": [
+          "of",
+          "the"
+        ]
+      },
+      "error": null,
+      "duration": "PT37.488777S",
+      "enqueuedAt": "2021-09-08T08:24:02.323444Z",
+      "startedAt": "2021-09-08T08:24:02.324145Z",
+      "finishedAt": "2021-09-08T08:24:39.812922Z"
+    }
+  ],
+  "limit": 1,
+  "from": 1,
+  "next": 0
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/7.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/7.snap
new file mode 100644
index 000000000..4253f1d0e
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_movie_with_settings/7.snap
@@ -0,0 +1,42 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 1,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "settingsUpdate",
+      "canceledBy": null,
+      "details": {
+        "displayedAttributes": [
+          "title",
+          "genres",
+          "overview",
+          "poster",
+          "release_date"
+        ],
+        "searchableAttributes": [
+          "title",
+          "overview"
+        ],
+        "filterableAttributes": [
+          "genres"
+        ],
+        "stopWords": [
+          "of",
+          "the"
+        ]
+      },
+      "error": null,
+      "duration": "PT37.488777S",
+      "enqueuedAt": "2021-09-08T08:24:02.323444Z",
+      "startedAt": "2021-09-08T08:24:02.324145Z",
+      "finishedAt": "2021-09-08T08:24:39.812922Z"
+    }
+  ],
+  "limit": 1,
+  "from": 1,
+  "next": 0
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/1.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/1.snap
new file mode 100644
index 000000000..00d18a4f0
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/1.snap
@@ -0,0 +1,47 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 0,
+      "indexUid": "rubygems",
+      "status": "succeeded",
+      "type": "settingsUpdate",
+      "canceledBy": null,
+      "details": {
+        "displayedAttributes": [
+          "name",
+          "summary",
+          "description",
+          "version",
+          "total_downloads"
+        ],
+        "searchableAttributes": [
+          "name",
+          "summary"
+        ],
+        "filterableAttributes": [
+          "version"
+        ],
+        "rankingRules": [
+          "typo",
+          "words",
+          "fame:desc",
+          "proximity",
+          "attribute",
+          "exactness",
+          "total_downloads:desc"
+        ]
+      },
+      "error": null,
+      "duration": "PT0.008886S",
+      "enqueuedAt": "2021-09-08T08:40:28.660188Z",
+      "startedAt": "2021-09-08T08:40:28.660766Z",
+      "finishedAt": "2021-09-08T08:40:28.669652Z"
+    }
+  ],
+  "limit": 1,
+  "from": 0,
+  "next": null
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/2.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/2.snap
new file mode 100644
index 000000000..6a2fbe74f
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/2.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 92,
+      "indexUid": "rubygems",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 1042
+      },
+      "error": null,
+      "duration": "PT14.034672S",
+      "enqueuedAt": "2021-09-08T08:40:31.390775Z",
+      "startedAt": "2021-09-08T08:51:39.060642Z",
+      "finishedAt": "2021-09-08T08:51:53.095314Z"
+    }
+  ],
+  "limit": 1,
+  "from": 92,
+  "next": 91
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/3.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/3.snap
new file mode 100644
index 000000000..6a2fbe74f
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/3.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 92,
+      "indexUid": "rubygems",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 1042
+      },
+      "error": null,
+      "duration": "PT14.034672S",
+      "enqueuedAt": "2021-09-08T08:40:31.390775Z",
+      "startedAt": "2021-09-08T08:51:39.060642Z",
+      "finishedAt": "2021-09-08T08:51:53.095314Z"
+    }
+  ],
+  "limit": 1,
+  "from": 92,
+  "next": 91
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/4.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/4.snap
new file mode 100644
index 000000000..6a2fbe74f
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/4.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 92,
+      "indexUid": "rubygems",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 1042
+      },
+      "error": null,
+      "duration": "PT14.034672S",
+      "enqueuedAt": "2021-09-08T08:40:31.390775Z",
+      "startedAt": "2021-09-08T08:51:39.060642Z",
+      "finishedAt": "2021-09-08T08:51:53.095314Z"
+    }
+  ],
+  "limit": 1,
+  "from": 92,
+  "next": 91
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/5.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/5.snap
new file mode 100644
index 000000000..6a2fbe74f
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/5.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 92,
+      "indexUid": "rubygems",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 1042
+      },
+      "error": null,
+      "duration": "PT14.034672S",
+      "enqueuedAt": "2021-09-08T08:40:31.390775Z",
+      "startedAt": "2021-09-08T08:51:39.060642Z",
+      "finishedAt": "2021-09-08T08:51:53.095314Z"
+    }
+  ],
+  "limit": 1,
+  "from": 92,
+  "next": 91
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/6.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/6.snap
new file mode 100644
index 000000000..6a2fbe74f
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/6.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 92,
+      "indexUid": "rubygems",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 1042
+      },
+      "error": null,
+      "duration": "PT14.034672S",
+      "enqueuedAt": "2021-09-08T08:40:31.390775Z",
+      "startedAt": "2021-09-08T08:51:39.060642Z",
+      "finishedAt": "2021-09-08T08:51:53.095314Z"
+    }
+  ],
+  "limit": 1,
+  "from": 92,
+  "next": 91
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/7.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/7.snap
new file mode 100644
index 000000000..6a2fbe74f
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v2_rubygems_with_settings/7.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 92,
+      "indexUid": "rubygems",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 1042
+      },
+      "error": null,
+      "duration": "PT14.034672S",
+      "enqueuedAt": "2021-09-08T08:40:31.390775Z",
+      "startedAt": "2021-09-08T08:51:39.060642Z",
+      "finishedAt": "2021-09-08T08:51:53.095314Z"
+    }
+  ],
+  "limit": 1,
+  "from": 92,
+  "next": 91
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/1.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/1.snap
new file mode 100644
index 000000000..6fb6c0e80
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/1.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 0,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 31944
+      },
+      "error": null,
+      "duration": "PT41.751156S",
+      "enqueuedAt": "2021-09-08T08:30:30.550282Z",
+      "startedAt": "2021-09-08T08:30:30.553012Z",
+      "finishedAt": "2021-09-08T08:31:12.304168Z"
+    }
+  ],
+  "limit": 1,
+  "from": 0,
+  "next": null
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/2.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/2.snap
new file mode 100644
index 000000000..6fb6c0e80
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/2.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 0,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 31944
+      },
+      "error": null,
+      "duration": "PT41.751156S",
+      "enqueuedAt": "2021-09-08T08:30:30.550282Z",
+      "startedAt": "2021-09-08T08:30:30.553012Z",
+      "finishedAt": "2021-09-08T08:31:12.304168Z"
+    }
+  ],
+  "limit": 1,
+  "from": 0,
+  "next": null
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/3.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/3.snap
new file mode 100644
index 000000000..6fb6c0e80
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/3.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 0,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 31944
+      },
+      "error": null,
+      "duration": "PT41.751156S",
+      "enqueuedAt": "2021-09-08T08:30:30.550282Z",
+      "startedAt": "2021-09-08T08:30:30.553012Z",
+      "finishedAt": "2021-09-08T08:31:12.304168Z"
+    }
+  ],
+  "limit": 1,
+  "from": 0,
+  "next": null
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/4.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/4.snap
new file mode 100644
index 000000000..6fb6c0e80
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/4.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 0,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 31944
+      },
+      "error": null,
+      "duration": "PT41.751156S",
+      "enqueuedAt": "2021-09-08T08:30:30.550282Z",
+      "startedAt": "2021-09-08T08:30:30.553012Z",
+      "finishedAt": "2021-09-08T08:31:12.304168Z"
+    }
+  ],
+  "limit": 1,
+  "from": 0,
+  "next": null
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/5.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/5.snap
new file mode 100644
index 000000000..6fb6c0e80
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/5.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 0,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 31944
+      },
+      "error": null,
+      "duration": "PT41.751156S",
+      "enqueuedAt": "2021-09-08T08:30:30.550282Z",
+      "startedAt": "2021-09-08T08:30:30.553012Z",
+      "finishedAt": "2021-09-08T08:31:12.304168Z"
+    }
+  ],
+  "limit": 1,
+  "from": 0,
+  "next": null
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/6.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/6.snap
new file mode 100644
index 000000000..6fb6c0e80
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/6.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 0,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 31944
+      },
+      "error": null,
+      "duration": "PT41.751156S",
+      "enqueuedAt": "2021-09-08T08:30:30.550282Z",
+      "startedAt": "2021-09-08T08:30:30.553012Z",
+      "finishedAt": "2021-09-08T08:31:12.304168Z"
+    }
+  ],
+  "limit": 1,
+  "from": 0,
+  "next": null
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/7.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/7.snap
new file mode 100644
index 000000000..6fb6c0e80
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_raw/7.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 0,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 31944
+      },
+      "error": null,
+      "duration": "PT41.751156S",
+      "enqueuedAt": "2021-09-08T08:30:30.550282Z",
+      "startedAt": "2021-09-08T08:30:30.553012Z",
+      "finishedAt": "2021-09-08T08:31:12.304168Z"
+    }
+  ],
+  "limit": 1,
+  "from": 0,
+  "next": null
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/1.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/1.snap
new file mode 100644
index 000000000..17dc6a4ee
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/1.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 0,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 31944
+      },
+      "error": null,
+      "duration": "PT39.941318S",
+      "enqueuedAt": "2021-09-08T08:21:14.742672Z",
+      "startedAt": "2021-09-08T08:21:14.750166Z",
+      "finishedAt": "2021-09-08T08:21:54.691484Z"
+    }
+  ],
+  "limit": 1,
+  "from": 0,
+  "next": null
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/2.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/2.snap
new file mode 100644
index 000000000..17dc6a4ee
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/2.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 0,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 31944
+      },
+      "error": null,
+      "duration": "PT39.941318S",
+      "enqueuedAt": "2021-09-08T08:21:14.742672Z",
+      "startedAt": "2021-09-08T08:21:14.750166Z",
+      "finishedAt": "2021-09-08T08:21:54.691484Z"
+    }
+  ],
+  "limit": 1,
+  "from": 0,
+  "next": null
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/3.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/3.snap
new file mode 100644
index 000000000..4253f1d0e
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/3.snap
@@ -0,0 +1,42 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 1,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "settingsUpdate",
+      "canceledBy": null,
+      "details": {
+        "displayedAttributes": [
+          "title",
+          "genres",
+          "overview",
+          "poster",
+          "release_date"
+        ],
+        "searchableAttributes": [
+          "title",
+          "overview"
+        ],
+        "filterableAttributes": [
+          "genres"
+        ],
+        "stopWords": [
+          "of",
+          "the"
+        ]
+      },
+      "error": null,
+      "duration": "PT37.488777S",
+      "enqueuedAt": "2021-09-08T08:24:02.323444Z",
+      "startedAt": "2021-09-08T08:24:02.324145Z",
+      "finishedAt": "2021-09-08T08:24:39.812922Z"
+    }
+  ],
+  "limit": 1,
+  "from": 1,
+  "next": 0
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/4.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/4.snap
new file mode 100644
index 000000000..4253f1d0e
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/4.snap
@@ -0,0 +1,42 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 1,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "settingsUpdate",
+      "canceledBy": null,
+      "details": {
+        "displayedAttributes": [
+          "title",
+          "genres",
+          "overview",
+          "poster",
+          "release_date"
+        ],
+        "searchableAttributes": [
+          "title",
+          "overview"
+        ],
+        "filterableAttributes": [
+          "genres"
+        ],
+        "stopWords": [
+          "of",
+          "the"
+        ]
+      },
+      "error": null,
+      "duration": "PT37.488777S",
+      "enqueuedAt": "2021-09-08T08:24:02.323444Z",
+      "startedAt": "2021-09-08T08:24:02.324145Z",
+      "finishedAt": "2021-09-08T08:24:39.812922Z"
+    }
+  ],
+  "limit": 1,
+  "from": 1,
+  "next": 0
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/5.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/5.snap
new file mode 100644
index 000000000..4253f1d0e
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/5.snap
@@ -0,0 +1,42 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 1,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "settingsUpdate",
+      "canceledBy": null,
+      "details": {
+        "displayedAttributes": [
+          "title",
+          "genres",
+          "overview",
+          "poster",
+          "release_date"
+        ],
+        "searchableAttributes": [
+          "title",
+          "overview"
+        ],
+        "filterableAttributes": [
+          "genres"
+        ],
+        "stopWords": [
+          "of",
+          "the"
+        ]
+      },
+      "error": null,
+      "duration": "PT37.488777S",
+      "enqueuedAt": "2021-09-08T08:24:02.323444Z",
+      "startedAt": "2021-09-08T08:24:02.324145Z",
+      "finishedAt": "2021-09-08T08:24:39.812922Z"
+    }
+  ],
+  "limit": 1,
+  "from": 1,
+  "next": 0
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/6.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/6.snap
new file mode 100644
index 000000000..4253f1d0e
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/6.snap
@@ -0,0 +1,42 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 1,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "settingsUpdate",
+      "canceledBy": null,
+      "details": {
+        "displayedAttributes": [
+          "title",
+          "genres",
+          "overview",
+          "poster",
+          "release_date"
+        ],
+        "searchableAttributes": [
+          "title",
+          "overview"
+        ],
+        "filterableAttributes": [
+          "genres"
+        ],
+        "stopWords": [
+          "of",
+          "the"
+        ]
+      },
+      "error": null,
+      "duration": "PT37.488777S",
+      "enqueuedAt": "2021-09-08T08:24:02.323444Z",
+      "startedAt": "2021-09-08T08:24:02.324145Z",
+      "finishedAt": "2021-09-08T08:24:39.812922Z"
+    }
+  ],
+  "limit": 1,
+  "from": 1,
+  "next": 0
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/7.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/7.snap
new file mode 100644
index 000000000..4253f1d0e
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_movie_with_settings/7.snap
@@ -0,0 +1,42 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 1,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "settingsUpdate",
+      "canceledBy": null,
+      "details": {
+        "displayedAttributes": [
+          "title",
+          "genres",
+          "overview",
+          "poster",
+          "release_date"
+        ],
+        "searchableAttributes": [
+          "title",
+          "overview"
+        ],
+        "filterableAttributes": [
+          "genres"
+        ],
+        "stopWords": [
+          "of",
+          "the"
+        ]
+      },
+      "error": null,
+      "duration": "PT37.488777S",
+      "enqueuedAt": "2021-09-08T08:24:02.323444Z",
+      "startedAt": "2021-09-08T08:24:02.324145Z",
+      "finishedAt": "2021-09-08T08:24:39.812922Z"
+    }
+  ],
+  "limit": 1,
+  "from": 1,
+  "next": 0
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/1.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/1.snap
new file mode 100644
index 000000000..00d18a4f0
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/1.snap
@@ -0,0 +1,47 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 0,
+      "indexUid": "rubygems",
+      "status": "succeeded",
+      "type": "settingsUpdate",
+      "canceledBy": null,
+      "details": {
+        "displayedAttributes": [
+          "name",
+          "summary",
+          "description",
+          "version",
+          "total_downloads"
+        ],
+        "searchableAttributes": [
+          "name",
+          "summary"
+        ],
+        "filterableAttributes": [
+          "version"
+        ],
+        "rankingRules": [
+          "typo",
+          "words",
+          "fame:desc",
+          "proximity",
+          "attribute",
+          "exactness",
+          "total_downloads:desc"
+        ]
+      },
+      "error": null,
+      "duration": "PT0.008886S",
+      "enqueuedAt": "2021-09-08T08:40:28.660188Z",
+      "startedAt": "2021-09-08T08:40:28.660766Z",
+      "finishedAt": "2021-09-08T08:40:28.669652Z"
+    }
+  ],
+  "limit": 1,
+  "from": 0,
+  "next": null
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/2.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/2.snap
new file mode 100644
index 000000000..6a2fbe74f
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/2.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 92,
+      "indexUid": "rubygems",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 1042
+      },
+      "error": null,
+      "duration": "PT14.034672S",
+      "enqueuedAt": "2021-09-08T08:40:31.390775Z",
+      "startedAt": "2021-09-08T08:51:39.060642Z",
+      "finishedAt": "2021-09-08T08:51:53.095314Z"
+    }
+  ],
+  "limit": 1,
+  "from": 92,
+  "next": 91
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/3.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/3.snap
new file mode 100644
index 000000000..6a2fbe74f
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/3.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 92,
+      "indexUid": "rubygems",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 1042
+      },
+      "error": null,
+      "duration": "PT14.034672S",
+      "enqueuedAt": "2021-09-08T08:40:31.390775Z",
+      "startedAt": "2021-09-08T08:51:39.060642Z",
+      "finishedAt": "2021-09-08T08:51:53.095314Z"
+    }
+  ],
+  "limit": 1,
+  "from": 92,
+  "next": 91
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/4.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/4.snap
new file mode 100644
index 000000000..6a2fbe74f
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/4.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 92,
+      "indexUid": "rubygems",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 1042
+      },
+      "error": null,
+      "duration": "PT14.034672S",
+      "enqueuedAt": "2021-09-08T08:40:31.390775Z",
+      "startedAt": "2021-09-08T08:51:39.060642Z",
+      "finishedAt": "2021-09-08T08:51:53.095314Z"
+    }
+  ],
+  "limit": 1,
+  "from": 92,
+  "next": 91
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/5.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/5.snap
new file mode 100644
index 000000000..6a2fbe74f
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/5.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 92,
+      "indexUid": "rubygems",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 1042
+      },
+      "error": null,
+      "duration": "PT14.034672S",
+      "enqueuedAt": "2021-09-08T08:40:31.390775Z",
+      "startedAt": "2021-09-08T08:51:39.060642Z",
+      "finishedAt": "2021-09-08T08:51:53.095314Z"
+    }
+  ],
+  "limit": 1,
+  "from": 92,
+  "next": 91
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/6.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/6.snap
new file mode 100644
index 000000000..6a2fbe74f
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/6.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 92,
+      "indexUid": "rubygems",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 1042
+      },
+      "error": null,
+      "duration": "PT14.034672S",
+      "enqueuedAt": "2021-09-08T08:40:31.390775Z",
+      "startedAt": "2021-09-08T08:51:39.060642Z",
+      "finishedAt": "2021-09-08T08:51:53.095314Z"
+    }
+  ],
+  "limit": 1,
+  "from": 92,
+  "next": 91
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/7.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/7.snap
new file mode 100644
index 000000000..6a2fbe74f
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v3_rubygems_with_settings/7.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 92,
+      "indexUid": "rubygems",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 1042
+      },
+      "error": null,
+      "duration": "PT14.034672S",
+      "enqueuedAt": "2021-09-08T08:40:31.390775Z",
+      "startedAt": "2021-09-08T08:51:39.060642Z",
+      "finishedAt": "2021-09-08T08:51:53.095314Z"
+    }
+  ],
+  "limit": 1,
+  "from": 92,
+  "next": 91
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/1.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/1.snap
new file mode 100644
index 000000000..6fb6c0e80
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/1.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 0,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 31944
+      },
+      "error": null,
+      "duration": "PT41.751156S",
+      "enqueuedAt": "2021-09-08T08:30:30.550282Z",
+      "startedAt": "2021-09-08T08:30:30.553012Z",
+      "finishedAt": "2021-09-08T08:31:12.304168Z"
+    }
+  ],
+  "limit": 1,
+  "from": 0,
+  "next": null
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/2.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/2.snap
new file mode 100644
index 000000000..6fb6c0e80
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/2.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 0,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 31944
+      },
+      "error": null,
+      "duration": "PT41.751156S",
+      "enqueuedAt": "2021-09-08T08:30:30.550282Z",
+      "startedAt": "2021-09-08T08:30:30.553012Z",
+      "finishedAt": "2021-09-08T08:31:12.304168Z"
+    }
+  ],
+  "limit": 1,
+  "from": 0,
+  "next": null
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/3.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/3.snap
new file mode 100644
index 000000000..6fb6c0e80
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/3.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 0,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 31944
+      },
+      "error": null,
+      "duration": "PT41.751156S",
+      "enqueuedAt": "2021-09-08T08:30:30.550282Z",
+      "startedAt": "2021-09-08T08:30:30.553012Z",
+      "finishedAt": "2021-09-08T08:31:12.304168Z"
+    }
+  ],
+  "limit": 1,
+  "from": 0,
+  "next": null
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/4.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/4.snap
new file mode 100644
index 000000000..6fb6c0e80
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/4.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 0,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 31944
+      },
+      "error": null,
+      "duration": "PT41.751156S",
+      "enqueuedAt": "2021-09-08T08:30:30.550282Z",
+      "startedAt": "2021-09-08T08:30:30.553012Z",
+      "finishedAt": "2021-09-08T08:31:12.304168Z"
+    }
+  ],
+  "limit": 1,
+  "from": 0,
+  "next": null
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/5.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/5.snap
new file mode 100644
index 000000000..6fb6c0e80
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/5.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 0,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 31944
+      },
+      "error": null,
+      "duration": "PT41.751156S",
+      "enqueuedAt": "2021-09-08T08:30:30.550282Z",
+      "startedAt": "2021-09-08T08:30:30.553012Z",
+      "finishedAt": "2021-09-08T08:31:12.304168Z"
+    }
+  ],
+  "limit": 1,
+  "from": 0,
+  "next": null
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/6.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/6.snap
new file mode 100644
index 000000000..6fb6c0e80
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/6.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 0,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 31944
+      },
+      "error": null,
+      "duration": "PT41.751156S",
+      "enqueuedAt": "2021-09-08T08:30:30.550282Z",
+      "startedAt": "2021-09-08T08:30:30.553012Z",
+      "finishedAt": "2021-09-08T08:31:12.304168Z"
+    }
+  ],
+  "limit": 1,
+  "from": 0,
+  "next": null
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/7.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/7.snap
new file mode 100644
index 000000000..6fb6c0e80
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_raw/7.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 0,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 31944
+      },
+      "error": null,
+      "duration": "PT41.751156S",
+      "enqueuedAt": "2021-09-08T08:30:30.550282Z",
+      "startedAt": "2021-09-08T08:30:30.553012Z",
+      "finishedAt": "2021-09-08T08:31:12.304168Z"
+    }
+  ],
+  "limit": 1,
+  "from": 0,
+  "next": null
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/1.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/1.snap
new file mode 100644
index 000000000..17dc6a4ee
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/1.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 0,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 31944
+      },
+      "error": null,
+      "duration": "PT39.941318S",
+      "enqueuedAt": "2021-09-08T08:21:14.742672Z",
+      "startedAt": "2021-09-08T08:21:14.750166Z",
+      "finishedAt": "2021-09-08T08:21:54.691484Z"
+    }
+  ],
+  "limit": 1,
+  "from": 0,
+  "next": null
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/2.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/2.snap
new file mode 100644
index 000000000..17dc6a4ee
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/2.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 0,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 31944
+      },
+      "error": null,
+      "duration": "PT39.941318S",
+      "enqueuedAt": "2021-09-08T08:21:14.742672Z",
+      "startedAt": "2021-09-08T08:21:14.750166Z",
+      "finishedAt": "2021-09-08T08:21:54.691484Z"
+    }
+  ],
+  "limit": 1,
+  "from": 0,
+  "next": null
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/3.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/3.snap
new file mode 100644
index 000000000..4253f1d0e
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/3.snap
@@ -0,0 +1,42 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 1,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "settingsUpdate",
+      "canceledBy": null,
+      "details": {
+        "displayedAttributes": [
+          "title",
+          "genres",
+          "overview",
+          "poster",
+          "release_date"
+        ],
+        "searchableAttributes": [
+          "title",
+          "overview"
+        ],
+        "filterableAttributes": [
+          "genres"
+        ],
+        "stopWords": [
+          "of",
+          "the"
+        ]
+      },
+      "error": null,
+      "duration": "PT37.488777S",
+      "enqueuedAt": "2021-09-08T08:24:02.323444Z",
+      "startedAt": "2021-09-08T08:24:02.324145Z",
+      "finishedAt": "2021-09-08T08:24:39.812922Z"
+    }
+  ],
+  "limit": 1,
+  "from": 1,
+  "next": 0
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/4.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/4.snap
new file mode 100644
index 000000000..4253f1d0e
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/4.snap
@@ -0,0 +1,42 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 1,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "settingsUpdate",
+      "canceledBy": null,
+      "details": {
+        "displayedAttributes": [
+          "title",
+          "genres",
+          "overview",
+          "poster",
+          "release_date"
+        ],
+        "searchableAttributes": [
+          "title",
+          "overview"
+        ],
+        "filterableAttributes": [
+          "genres"
+        ],
+        "stopWords": [
+          "of",
+          "the"
+        ]
+      },
+      "error": null,
+      "duration": "PT37.488777S",
+      "enqueuedAt": "2021-09-08T08:24:02.323444Z",
+      "startedAt": "2021-09-08T08:24:02.324145Z",
+      "finishedAt": "2021-09-08T08:24:39.812922Z"
+    }
+  ],
+  "limit": 1,
+  "from": 1,
+  "next": 0
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/5.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/5.snap
new file mode 100644
index 000000000..4253f1d0e
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/5.snap
@@ -0,0 +1,42 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 1,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "settingsUpdate",
+      "canceledBy": null,
+      "details": {
+        "displayedAttributes": [
+          "title",
+          "genres",
+          "overview",
+          "poster",
+          "release_date"
+        ],
+        "searchableAttributes": [
+          "title",
+          "overview"
+        ],
+        "filterableAttributes": [
+          "genres"
+        ],
+        "stopWords": [
+          "of",
+          "the"
+        ]
+      },
+      "error": null,
+      "duration": "PT37.488777S",
+      "enqueuedAt": "2021-09-08T08:24:02.323444Z",
+      "startedAt": "2021-09-08T08:24:02.324145Z",
+      "finishedAt": "2021-09-08T08:24:39.812922Z"
+    }
+  ],
+  "limit": 1,
+  "from": 1,
+  "next": 0
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/6.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/6.snap
new file mode 100644
index 000000000..4253f1d0e
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/6.snap
@@ -0,0 +1,42 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 1,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "settingsUpdate",
+      "canceledBy": null,
+      "details": {
+        "displayedAttributes": [
+          "title",
+          "genres",
+          "overview",
+          "poster",
+          "release_date"
+        ],
+        "searchableAttributes": [
+          "title",
+          "overview"
+        ],
+        "filterableAttributes": [
+          "genres"
+        ],
+        "stopWords": [
+          "of",
+          "the"
+        ]
+      },
+      "error": null,
+      "duration": "PT37.488777S",
+      "enqueuedAt": "2021-09-08T08:24:02.323444Z",
+      "startedAt": "2021-09-08T08:24:02.324145Z",
+      "finishedAt": "2021-09-08T08:24:39.812922Z"
+    }
+  ],
+  "limit": 1,
+  "from": 1,
+  "next": 0
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/7.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/7.snap
new file mode 100644
index 000000000..4253f1d0e
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_movie_with_settings/7.snap
@@ -0,0 +1,42 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 1,
+      "indexUid": "indexUID",
+      "status": "succeeded",
+      "type": "settingsUpdate",
+      "canceledBy": null,
+      "details": {
+        "displayedAttributes": [
+          "title",
+          "genres",
+          "overview",
+          "poster",
+          "release_date"
+        ],
+        "searchableAttributes": [
+          "title",
+          "overview"
+        ],
+        "filterableAttributes": [
+          "genres"
+        ],
+        "stopWords": [
+          "of",
+          "the"
+        ]
+      },
+      "error": null,
+      "duration": "PT37.488777S",
+      "enqueuedAt": "2021-09-08T08:24:02.323444Z",
+      "startedAt": "2021-09-08T08:24:02.324145Z",
+      "finishedAt": "2021-09-08T08:24:39.812922Z"
+    }
+  ],
+  "limit": 1,
+  "from": 1,
+  "next": 0
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/1.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/1.snap
new file mode 100644
index 000000000..00d18a4f0
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/1.snap
@@ -0,0 +1,47 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 0,
+      "indexUid": "rubygems",
+      "status": "succeeded",
+      "type": "settingsUpdate",
+      "canceledBy": null,
+      "details": {
+        "displayedAttributes": [
+          "name",
+          "summary",
+          "description",
+          "version",
+          "total_downloads"
+        ],
+        "searchableAttributes": [
+          "name",
+          "summary"
+        ],
+        "filterableAttributes": [
+          "version"
+        ],
+        "rankingRules": [
+          "typo",
+          "words",
+          "fame:desc",
+          "proximity",
+          "attribute",
+          "exactness",
+          "total_downloads:desc"
+        ]
+      },
+      "error": null,
+      "duration": "PT0.008886S",
+      "enqueuedAt": "2021-09-08T08:40:28.660188Z",
+      "startedAt": "2021-09-08T08:40:28.660766Z",
+      "finishedAt": "2021-09-08T08:40:28.669652Z"
+    }
+  ],
+  "limit": 1,
+  "from": 0,
+  "next": null
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/2.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/2.snap
new file mode 100644
index 000000000..6a2fbe74f
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/2.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 92,
+      "indexUid": "rubygems",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 1042
+      },
+      "error": null,
+      "duration": "PT14.034672S",
+      "enqueuedAt": "2021-09-08T08:40:31.390775Z",
+      "startedAt": "2021-09-08T08:51:39.060642Z",
+      "finishedAt": "2021-09-08T08:51:53.095314Z"
+    }
+  ],
+  "limit": 1,
+  "from": 92,
+  "next": 91
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/3.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/3.snap
new file mode 100644
index 000000000..6a2fbe74f
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/3.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 92,
+      "indexUid": "rubygems",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 1042
+      },
+      "error": null,
+      "duration": "PT14.034672S",
+      "enqueuedAt": "2021-09-08T08:40:31.390775Z",
+      "startedAt": "2021-09-08T08:51:39.060642Z",
+      "finishedAt": "2021-09-08T08:51:53.095314Z"
+    }
+  ],
+  "limit": 1,
+  "from": 92,
+  "next": 91
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/4.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/4.snap
new file mode 100644
index 000000000..6a2fbe74f
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/4.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 92,
+      "indexUid": "rubygems",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 1042
+      },
+      "error": null,
+      "duration": "PT14.034672S",
+      "enqueuedAt": "2021-09-08T08:40:31.390775Z",
+      "startedAt": "2021-09-08T08:51:39.060642Z",
+      "finishedAt": "2021-09-08T08:51:53.095314Z"
+    }
+  ],
+  "limit": 1,
+  "from": 92,
+  "next": 91
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/5.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/5.snap
new file mode 100644
index 000000000..6a2fbe74f
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/5.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 92,
+      "indexUid": "rubygems",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 1042
+      },
+      "error": null,
+      "duration": "PT14.034672S",
+      "enqueuedAt": "2021-09-08T08:40:31.390775Z",
+      "startedAt": "2021-09-08T08:51:39.060642Z",
+      "finishedAt": "2021-09-08T08:51:53.095314Z"
+    }
+  ],
+  "limit": 1,
+  "from": 92,
+  "next": 91
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/6.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/6.snap
new file mode 100644
index 000000000..6a2fbe74f
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/6.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 92,
+      "indexUid": "rubygems",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 1042
+      },
+      "error": null,
+      "duration": "PT14.034672S",
+      "enqueuedAt": "2021-09-08T08:40:31.390775Z",
+      "startedAt": "2021-09-08T08:51:39.060642Z",
+      "finishedAt": "2021-09-08T08:51:53.095314Z"
+    }
+  ],
+  "limit": 1,
+  "from": 92,
+  "next": 91
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/7.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/7.snap
new file mode 100644
index 000000000..6a2fbe74f
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v4_rubygems_with_settings/7.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 92,
+      "indexUid": "rubygems",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 0,
+        "indexedDocuments": 1042
+      },
+      "error": null,
+      "duration": "PT14.034672S",
+      "enqueuedAt": "2021-09-08T08:40:31.390775Z",
+      "startedAt": "2021-09-08T08:51:39.060642Z",
+      "finishedAt": "2021-09-08T08:51:53.095314Z"
+    }
+  ],
+  "limit": 1,
+  "from": 92,
+  "next": 91
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/1.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/1.snap
new file mode 100644
index 000000000..4ca8cbba0
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/1.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 0,
+      "indexUid": "test",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 10,
+        "indexedDocuments": 10
+      },
+      "error": null,
+      "duration": "PT0.079460S",
+      "enqueuedAt": "2022-06-08T14:59:24.724025Z",
+      "startedAt": "2022-06-08T14:59:24.724983Z",
+      "finishedAt": "2022-06-08T14:59:24.804443Z"
+    }
+  ],
+  "limit": 1,
+  "from": 0,
+  "next": null
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/2.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/2.snap
new file mode 100644
index 000000000..a5cee8ace
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/2.snap
@@ -0,0 +1,26 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 1,
+      "indexUid": "test2",
+      "status": "succeeded",
+      "type": "documentAdditionOrUpdate",
+      "canceledBy": null,
+      "details": {
+        "receivedDocuments": 10,
+        "indexedDocuments": 10
+      },
+      "error": null,
+      "duration": "PT0.076765S",
+      "enqueuedAt": "2022-06-08T14:59:29.920479Z",
+      "startedAt": "2022-06-08T14:59:29.921016Z",
+      "finishedAt": "2022-06-08T14:59:29.997781Z"
+    }
+  ],
+  "limit": 1,
+  "from": 1,
+  "next": 0
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/3.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/3.snap
new file mode 100644
index 000000000..29b42313b
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/3.snap
@@ -0,0 +1,25 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 4,
+      "indexUid": null,
+      "status": "succeeded",
+      "type": "dumpCreation",
+      "canceledBy": null,
+      "details": {
+        "dumpUid": "[uid]"
+      },
+      "error": null,
+      "duration": "[duration]",
+      "enqueuedAt": "2022-06-08T15:11:40.604805Z",
+      "startedAt": "[date]",
+      "finishedAt": "[date]"
+    }
+  ],
+  "limit": 1,
+  "from": 4,
+  "next": 3
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/4.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/4.snap
new file mode 100644
index 000000000..9e63e3340
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/4.snap
@@ -0,0 +1,30 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 2,
+      "indexUid": "test",
+      "status": "succeeded",
+      "type": "settingsUpdate",
+      "canceledBy": null,
+      "details": {
+        "typoTolerance": {
+          "minWordSizeForTypos": {
+            "oneTypo": 10,
+            "twoTypos": 17
+          }
+        }
+      },
+      "error": null,
+      "duration": "[duration]",
+      "enqueuedAt": "2022-06-08T15:01:14.794184Z",
+      "startedAt": "[date]",
+      "finishedAt": "[date]"
+    }
+  ],
+  "limit": 1,
+  "from": 2,
+  "next": 0
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/5.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/5.snap
new file mode 100644
index 000000000..29b42313b
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/5.snap
@@ -0,0 +1,25 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 4,
+      "indexUid": null,
+      "status": "succeeded",
+      "type": "dumpCreation",
+      "canceledBy": null,
+      "details": {
+        "dumpUid": "[uid]"
+      },
+      "error": null,
+      "duration": "[duration]",
+      "enqueuedAt": "2022-06-08T15:11:40.604805Z",
+      "startedAt": "[date]",
+      "finishedAt": "[date]"
+    }
+  ],
+  "limit": 1,
+  "from": 4,
+  "next": 3
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/6.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/6.snap
new file mode 100644
index 000000000..29b42313b
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/6.snap
@@ -0,0 +1,25 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 4,
+      "indexUid": null,
+      "status": "succeeded",
+      "type": "dumpCreation",
+      "canceledBy": null,
+      "details": {
+        "dumpUid": "[uid]"
+      },
+      "error": null,
+      "duration": "[duration]",
+      "enqueuedAt": "2022-06-08T15:11:40.604805Z",
+      "startedAt": "[date]",
+      "finishedAt": "[date]"
+    }
+  ],
+  "limit": 1,
+  "from": 4,
+  "next": 3
+}
diff --git a/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/7.snap b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/7.snap
new file mode 100644
index 000000000..29b42313b
--- /dev/null
+++ b/meilisearch/tests/dumps/snapshots/mod.rs/import_dump_v5/7.snap
@@ -0,0 +1,25 @@
+---
+source: meilisearch/tests/dumps/mod.rs
+---
+{
+  "results": [
+    {
+      "uid": 4,
+      "indexUid": null,
+      "status": "succeeded",
+      "type": "dumpCreation",
+      "canceledBy": null,
+      "details": {
+        "dumpUid": "[uid]"
+      },
+      "error": null,
+      "duration": "[duration]",
+      "enqueuedAt": "2022-06-08T15:11:40.604805Z",
+      "startedAt": "[date]",
+      "finishedAt": "[date]"
+    }
+  ],
+  "limit": 1,
+  "from": 4,
+  "next": 3
+}
diff --git a/meilisearch/tests/search/errors.rs b/meilisearch/tests/search/errors.rs
index 9e4dbdcf5..0aaf87773 100644
--- a/meilisearch/tests/search/errors.rs
+++ b/meilisearch/tests/search/errors.rs
@@ -672,7 +672,7 @@ async fn filter_reserved_geo_attribute_array() {
     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` field coordinates.\n1:5 _geo = Glass",
+        "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",
         "code": "invalid_search_filter",
         "type": "invalid_request",
         "link": "https://docs.meilisearch.com/errors#invalid_search_filter"
@@ -697,7 +697,7 @@ async fn filter_reserved_geo_attribute_string() {
     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` field coordinates.\n1:5 _geo = Glass",
+        "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",
         "code": "invalid_search_filter",
         "type": "invalid_request",
         "link": "https://docs.meilisearch.com/errors#invalid_search_filter"
@@ -722,7 +722,7 @@ async fn filter_reserved_attribute_array() {
     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.\n1:13 _geoDistance = Glass",
+        "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",
         "code": "invalid_search_filter",
         "type": "invalid_request",
         "link": "https://docs.meilisearch.com/errors#invalid_search_filter"
@@ -747,7 +747,7 @@ async fn filter_reserved_attribute_string() {
     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.\n1:13 _geoDistance = Glass",
+       "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",
         "code": "invalid_search_filter",
         "type": "invalid_request",
         "link": "https://docs.meilisearch.com/errors#invalid_search_filter"
@@ -760,6 +760,56 @@ async fn filter_reserved_attribute_string() {
         .await;
 }
 
+#[actix_rt::test]
+async fn filter_reserved_geo_point_array() {
+    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 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",
+        "code": "invalid_search_filter",
+        "type": "invalid_request",
+        "link": "https://docs.meilisearch.com/errors#invalid_search_filter"
+    });
+    index
+        .search(json!({"filter": ["_geoPoint = Glass"]}), |response, code| {
+            assert_eq!(response, expected_response);
+            assert_eq!(code, 400);
+        })
+        .await;
+}
+
+#[actix_rt::test]
+async fn filter_reserved_geo_point_string() {
+    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 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",
+        "code": "invalid_search_filter",
+        "type": "invalid_request",
+        "link": "https://docs.meilisearch.com/errors#invalid_search_filter"
+    });
+    index
+        .search(json!({"filter": "_geoPoint = Glass"}), |response, code| {
+            assert_eq!(response, expected_response);
+            assert_eq!(code, 400);
+        })
+        .await;
+}
+
 #[actix_rt::test]
 async fn sort_geo_reserved_attribute() {
     let server = Server::new().await;
diff --git a/meilisearch/tests/search/formatted.rs b/meilisearch/tests/search/formatted.rs
index 076c14fe0..8a40616a3 100644
--- a/meilisearch/tests/search/formatted.rs
+++ b/meilisearch/tests/search/formatted.rs
@@ -14,7 +14,7 @@ async fn formatted_contain_wildcard() {
     index.add_documents(documents, None).await;
     index.wait_task(1).await;
 
-    index.search(json!({ "q": "pesti", "attributesToRetrieve": ["father", "mother"], "attributesToHighlight": ["father", "mother", "*"], "attributesToCrop": ["doggos"], "showMatchesPosition": true }),
+    index.search(json!({ "q": "pésti", "attributesToRetrieve": ["father", "mother"], "attributesToHighlight": ["father", "mother", "*"], "attributesToCrop": ["doggos"], "showMatchesPosition": true }),
         |response, code|
         {
             assert_eq!(code, 200, "{}", response);
@@ -23,7 +23,7 @@ async fn formatted_contain_wildcard() {
                 json!({
                     "_formatted": {
                         "id": "852",
-                        "cattos": "<em>pesti</em>",
+                        "cattos": "<em>pésti</em>",
                     },
                     "_matchesPosition": {"cattos": [{"start": 0, "length": 5}]},
                 })
@@ -33,13 +33,13 @@ async fn formatted_contain_wildcard() {
     .await;
 
     index
-        .search(json!({ "q": "pesti", "attributesToRetrieve": ["*"] }), |response, code| {
+        .search(json!({ "q": "pésti", "attributesToRetrieve": ["*"] }), |response, code| {
             assert_eq!(code, 200, "{}", response);
             assert_eq!(
                 response["hits"][0],
                 json!({
                     "id": 852,
-                    "cattos": "pesti",
+                    "cattos": "pésti",
                 })
             );
         })
@@ -47,17 +47,17 @@ async fn formatted_contain_wildcard() {
 
     index
         .search(
-            json!({ "q": "pesti", "attributesToRetrieve": ["*"], "attributesToHighlight": ["id"], "showMatchesPosition": true }),
+            json!({ "q": "pésti", "attributesToRetrieve": ["*"], "attributesToHighlight": ["id"], "showMatchesPosition": true }),
             |response, code| {
                 assert_eq!(code, 200, "{}", response);
                 assert_eq!(
                     response["hits"][0],
                     json!({
                         "id": 852,
-                        "cattos": "pesti",
+                        "cattos": "pésti",
                         "_formatted": {
                             "id": "852",
-                            "cattos": "pesti",
+                            "cattos": "pésti",
                         },
                         "_matchesPosition": {"cattos": [{"start": 0, "length": 5}]},
                     })
@@ -68,17 +68,17 @@ async fn formatted_contain_wildcard() {
 
     index
         .search(
-            json!({ "q": "pesti", "attributesToRetrieve": ["*"], "attributesToCrop": ["*"] }),
+            json!({ "q": "pésti", "attributesToRetrieve": ["*"], "attributesToCrop": ["*"] }),
             |response, code| {
                 assert_eq!(code, 200, "{}", response);
                 assert_eq!(
                     response["hits"][0],
                     json!({
                         "id": 852,
-                        "cattos": "pesti",
+                        "cattos": "pésti",
                         "_formatted": {
                             "id": "852",
-                            "cattos": "pesti",
+                            "cattos": "pésti",
                         }
                     })
                 );
@@ -87,16 +87,16 @@ async fn formatted_contain_wildcard() {
         .await;
 
     index
-        .search(json!({ "q": "pesti", "attributesToCrop": ["*"] }), |response, code| {
+        .search(json!({ "q": "pésti", "attributesToCrop": ["*"] }), |response, code| {
             assert_eq!(code, 200, "{}", response);
             assert_eq!(
                 response["hits"][0],
                 json!({
                     "id": 852,
-                    "cattos": "pesti",
+                    "cattos": "pésti",
                     "_formatted": {
                         "id": "852",
-                        "cattos": "pesti",
+                        "cattos": "pésti",
                     }
                 })
             );
@@ -114,7 +114,7 @@ async fn format_nested() {
     index.wait_task(0).await;
 
     index
-        .search(json!({ "q": "pesti", "attributesToRetrieve": ["doggos"] }), |response, code| {
+        .search(json!({ "q": "pésti", "attributesToRetrieve": ["doggos"] }), |response, code| {
             assert_eq!(code, 200, "{}", response);
             assert_eq!(
                 response["hits"][0],
@@ -136,7 +136,7 @@ async fn format_nested() {
 
     index
         .search(
-            json!({ "q": "pesti", "attributesToRetrieve": ["doggos.name"] }),
+            json!({ "q": "pésti", "attributesToRetrieve": ["doggos.name"] }),
             |response, code| {
                 assert_eq!(code, 200, "{}", response);
                 assert_eq!(
@@ -180,7 +180,7 @@ async fn format_nested() {
         .await;
 
     index
-        .search(json!({ "q": "pesti", "attributesToRetrieve": [], "attributesToHighlight": ["doggos.name"] }),
+        .search(json!({ "q": "pésti", "attributesToRetrieve": [], "attributesToHighlight": ["doggos.name"] }),
         |response, code| {
             assert_eq!(code, 200, "{}", response);
             assert_eq!(
@@ -202,7 +202,7 @@ async fn format_nested() {
         .await;
 
     index
-        .search(json!({ "q": "pesti", "attributesToRetrieve": [], "attributesToCrop": ["doggos.name"] }),
+        .search(json!({ "q": "pésti", "attributesToRetrieve": [], "attributesToCrop": ["doggos.name"] }),
         |response, code| {
             assert_eq!(code, 200, "{}", response);
             assert_eq!(
@@ -224,7 +224,7 @@ async fn format_nested() {
         .await;
 
     index
-        .search(json!({ "q": "pesti", "attributesToRetrieve": ["doggos.name"], "attributesToHighlight": ["doggos.age"] }),
+        .search(json!({ "q": "pésti", "attributesToRetrieve": ["doggos.name"], "attributesToHighlight": ["doggos.age"] }),
         |response, code| {
     assert_eq!(code, 200, "{}", response);
     assert_eq!(
@@ -256,7 +256,7 @@ async fn format_nested() {
         .await;
 
     index
-        .search(json!({ "q": "pesti", "attributesToRetrieve": [], "attributesToHighlight": ["doggos.age"], "attributesToCrop": ["doggos.name"] }),
+        .search(json!({ "q": "pésti", "attributesToRetrieve": [], "attributesToHighlight": ["doggos.age"], "attributesToCrop": ["doggos.name"] }),
         |response, code| {
                 assert_eq!(code, 200, "{}", response);
     assert_eq!(
diff --git a/meilisearch/tests/search/mod.rs b/meilisearch/tests/search/mod.rs
index 9a51be676..045cfde2c 100644
--- a/meilisearch/tests/search/mod.rs
+++ b/meilisearch/tests/search/mod.rs
@@ -30,7 +30,7 @@ pub(self) static DOCUMENTS: Lazy<Value> = Lazy::new(|| {
             "id": "166428",
         },
         {
-            "title": "Glass",
+            "title": "Gläss",
             "id": "450465",
         }
     ])
@@ -52,7 +52,7 @@ pub(self) static NESTED_DOCUMENTS: Lazy<Value> = Lazy::new(|| {
                     "age": 4,
                 },
             ],
-            "cattos": "pesti",
+            "cattos": "pésti",
         },
         {
             "id": 654,
@@ -142,7 +142,7 @@ async fn simple_search() {
     index.wait_task(1).await;
 
     index
-        .search(json!({"q": "pesti"}), |response, code| {
+        .search(json!({"q": "pésti"}), |response, code| {
             assert_eq!(code, 200, "{}", response);
             assert_eq!(response["hits"].as_array().unwrap().len(), 2);
         })
@@ -192,6 +192,31 @@ async fn test_kanji_language_detection() {
         .await;
 }
 
+#[cfg(feature = "default")]
+#[actix_rt::test]
+async fn test_thai_language() {
+    let server = Server::new().await;
+    let index = server.index("test");
+
+    // We don't need documents, the issue is on the query side only.
+    let documents = json!([
+        { "id": 0, "title": "สบู่สมุนไพรดอกดาวเรือง 100 กรัม จำนวน 6 ก้อน" },
+        { "id": 1, "title": "สบู่สมุนไพรชาเขียว 100 กรัม จำนวน 6 ก้อน" },
+        { "id": 2, "title": "สบู่สมุนไพรฝางแดงผสมว่านหางจรเข้ 100 กรัม จำนวน 6 ก้อน" }
+    ]);
+    index.add_documents(documents, None).await;
+    index.wait_task(0).await;
+
+    index.update_settings(json!({"rankingRules": ["exactness"]})).await;
+    index.wait_task(1).await;
+
+    index
+        .search(json!({"q": "สบู"}), |response, code| {
+            assert_eq!(code, 200, "{}", response);
+        })
+        .await;
+}
+
 #[actix_rt::test]
 async fn search_multiple_params() {
     let server = Server::new().await;
@@ -225,7 +250,7 @@ async fn search_multiple_params() {
     index
         .search(
             json!({
-                "q": "pesti",
+                "q": "pésti",
                 "attributesToCrop": ["catto:2"],
                 "attributesToHighlight": ["catto"],
                 "limit": 2,
@@ -256,7 +281,7 @@ async fn search_with_filter_string_notation() {
     index
         .search(
             json!({
-                "filter": "title = Glass"
+                "filter": "title = Gläss"
             }),
             |response, code| {
                 assert_eq!(code, 200, "{}", response);
@@ -280,7 +305,7 @@ async fn search_with_filter_string_notation() {
     index
         .search(
             json!({
-                "filter": "cattos = pesti"
+                "filter": "cattos = pésti"
             }),
             |response, code| {
                 assert_eq!(code, 200, "{}", response);
@@ -318,7 +343,7 @@ async fn search_with_filter_array_notation() {
 
     let (response, code) = index
         .search_post(json!({
-            "filter": ["title = Glass"]
+            "filter": ["title = Gläss"]
         }))
         .await;
     assert_eq!(code, 200, "{}", response);
@@ -326,7 +351,7 @@ async fn search_with_filter_array_notation() {
 
     let (response, code) = index
         .search_post(json!({
-            "filter": [["title = Glass", "title = \"Shazam!\"", "title = \"Escape Room\""]]
+            "filter": [["title = Gläss", "title = \"Shazam!\"", "title = \"Escape Room\""]]
         }))
         .await;
     assert_eq!(code, 200, "{}", response);
diff --git a/meilisearch/tests/search/multi.rs b/meilisearch/tests/search/multi.rs
index 01751ff62..b00ddf3de 100644
--- a/meilisearch/tests/search/multi.rs
+++ b/meilisearch/tests/search/multi.rs
@@ -71,7 +71,7 @@ async fn simple_search_single_index() {
         "indexUid": "test",
         "hits": [
           {
-            "title": "Glass",
+            "title": "Gläss",
             "id": "450465"
           }
         ],
@@ -166,7 +166,7 @@ async fn simple_search_two_indexes() {
     let (response, code) = server
         .multi_search(json!({"queries": [
         {"indexUid" : "test", "q": "glass"},
-        {"indexUid": "nested", "q": "pesti"},
+        {"indexUid": "nested", "q": "pésti"},
         ]}))
         .await;
     snapshot!(code, @"200 OK");
@@ -176,7 +176,7 @@ async fn simple_search_two_indexes() {
         "indexUid": "test",
         "hits": [
           {
-            "title": "Glass",
+            "title": "Gläss",
             "id": "450465"
           }
         ],
@@ -203,7 +203,7 @@ async fn simple_search_two_indexes() {
                 "age": 4
               }
             ],
-            "cattos": "pesti"
+            "cattos": "pésti"
           },
           {
             "id": 654,
@@ -221,7 +221,7 @@ async fn simple_search_two_indexes() {
             ]
           }
         ],
-        "query": "pesti",
+        "query": "pésti",
         "processingTimeMs": "[time]",
         "limit": 20,
         "offset": 0,
@@ -243,7 +243,7 @@ async fn search_one_index_doesnt_exist() {
     let (response, code) = server
         .multi_search(json!({"queries": [
         {"indexUid" : "test", "q": "glass"},
-        {"indexUid": "nested", "q": "pesti"},
+        {"indexUid": "nested", "q": "pésti"},
         ]}))
         .await;
     snapshot!(code, @"400 Bad Request");
@@ -264,7 +264,7 @@ async fn search_multiple_indexes_dont_exist() {
     let (response, code) = server
         .multi_search(json!({"queries": [
         {"indexUid" : "test", "q": "glass"},
-        {"indexUid": "nested", "q": "pesti"},
+        {"indexUid": "nested", "q": "pésti"},
         ]}))
         .await;
     snapshot!(code, @"400 Bad Request");
@@ -296,7 +296,7 @@ async fn search_one_query_error() {
     let (response, code) = server
         .multi_search(json!({"queries": [
         {"indexUid" : "test", "q": "glass", "facets": ["title"]},
-        {"indexUid": "nested", "q": "pesti"},
+        {"indexUid": "nested", "q": "pésti"},
         ]}))
         .await;
     snapshot!(code, @"400 Bad Request");
@@ -328,7 +328,7 @@ async fn search_multiple_query_errors() {
     let (response, code) = server
         .multi_search(json!({"queries": [
         {"indexUid" : "test", "q": "glass", "facets": ["title"]},
-        {"indexUid": "nested", "q": "pesti", "facets": ["doggos"]},
+        {"indexUid": "nested", "q": "pésti", "facets": ["doggos"]},
         ]}))
         .await;
     snapshot!(code, @"400 Bad Request");
diff --git a/meilisearch/tests/snapshot/mod.rs b/meilisearch/tests/snapshot/mod.rs
index 4615f3ea9..97db3db8d 100644
--- a/meilisearch/tests/snapshot/mod.rs
+++ b/meilisearch/tests/snapshot/mod.rs
@@ -1,8 +1,8 @@
 use std::time::Duration;
 
+use actix_rt::time::sleep;
 use meilisearch::option::ScheduleSnapshot;
 use meilisearch::Opt;
-use tokio::time::sleep;
 
 use crate::common::server::default_settings;
 use crate::common::{GetAllDocumentsOptions, Server};
@@ -23,21 +23,20 @@ macro_rules! verify_snapshot {
                     };
                     let (snapshot, _) = test(snapshot.clone()).await;
                     let (orig, _) = test(orig.clone()).await;
-                    assert_eq!(snapshot, orig);
+                    assert_eq!(snapshot, orig, "Got \n{}\nWhile expecting:\n{}", serde_json::to_string_pretty(&snapshot).unwrap(), serde_json::to_string_pretty(&orig).unwrap());
                 }
             )*
     };
 }
 
 #[actix_rt::test]
-#[ignore] // TODO: unignore
 async fn perform_snapshot() {
     let temp = tempfile::tempdir().unwrap();
     let snapshot_dir = tempfile::tempdir().unwrap();
 
     let options = Opt {
         snapshot_dir: snapshot_dir.path().to_owned(),
-        schedule_snapshot: ScheduleSnapshot::Enabled(1),
+        schedule_snapshot: ScheduleSnapshot::Enabled(2),
         ..default_settings(temp.path())
     };
 
@@ -61,6 +60,16 @@ async fn perform_snapshot() {
     let temp = tempfile::tempdir().unwrap();
 
     let snapshot_path = snapshot_dir.path().to_owned().join("db.snapshot");
+    #[cfg_attr(windows, allow(unused))]
+    let snapshot_meta = std::fs::metadata(&snapshot_path).unwrap();
+
+    #[cfg(unix)]
+    {
+        use std::os::unix::fs::PermissionsExt;
+        let mode = snapshot_meta.permissions().mode();
+        //                                                    rwxrwxrwx
+        meili_snap::snapshot!(format!("{:b}", mode), @"1000000100100100");
+    }
 
     let options = Opt { import_snapshot: Some(snapshot_path), ..default_settings(temp.path()) };
 
@@ -71,7 +80,10 @@ async fn perform_snapshot() {
         // for some reason the db sizes differ. this may be due to the compaction options we have
         // set when performing the snapshot
         //server.stats(),
-        server.tasks(),
+
+        // The original instance contains the snapshotCreation task, while the snapshotted-instance does not. For this reason we need to compare the task queue **after** the task 4
+        server.tasks_filter("?from=2"),
+
         server.index("test").get_all_documents(GetAllDocumentsOptions::default()),
         server.index("test").settings(),
         server.index("test1").get_all_documents(GetAllDocumentsOptions::default()),
diff --git a/milli/src/asc_desc.rs b/milli/src/asc_desc.rs
index bbc49ea7d..bde0dd440 100644
--- a/milli/src/asc_desc.rs
+++ b/milli/src/asc_desc.rs
@@ -81,6 +81,8 @@ impl FromStr for Member {
                 if is_reserved_keyword(text)
                     || text.starts_with("_geoRadius(")
                     || text.starts_with("_geoBoundingBox(")
+                    || text.starts_with("_geo(")
+                    || text.starts_with("_geoDistance(")
                 {
                     return Err(AscDescError::ReservedKeyword { name: text.to_string() })?;
                 }
@@ -265,6 +267,13 @@ mod tests {
             ("_geoPoint(0, -180.000001):desc", GeoError(BadGeoError::Lng(-180.000001))),
             ("_geoPoint(159.256, 130):asc", GeoError(BadGeoError::Lat(159.256))),
             ("_geoPoint(12, -2021):desc", GeoError(BadGeoError::Lng(-2021.))),
+            ("_geo(12, -2021):asc", ReservedKeyword { name: S("_geo(12, -2021)") }),
+            ("_geo(12, -2021):desc", ReservedKeyword { name: S("_geo(12, -2021)") }),
+            ("_geoDistance(12, -2021):asc", ReservedKeyword { name: S("_geoDistance(12, -2021)") }),
+            (
+                "_geoDistance(12, -2021):desc",
+                ReservedKeyword { name: S("_geoDistance(12, -2021)") },
+            ),
         ];
 
         for (req, expected_error) in invalid_req {
diff --git a/milli/src/index.rs b/milli/src/index.rs
index 7848ddf5a..a36868ef2 100644
--- a/milli/src/index.rs
+++ b/milli/src/index.rs
@@ -1222,11 +1222,22 @@ impl Index {
         let soft_deleted_documents = self.soft_deleted_documents_ids(rtxn)?;
 
         let mut script_language: HashMap<Script, Vec<Language>> = HashMap::new();
+        let mut script_language_doc_count: Vec<(Script, Language, u64)> = Vec::new();
+        let mut total = 0;
         for sl in self.script_language_docids.iter(rtxn)? {
             let ((script, language), docids) = sl?;
 
             // keep only Languages that contains at least 1 document.
-            if !soft_deleted_documents.is_superset(&docids) {
+            let remaining_documents_count = (docids - &soft_deleted_documents).len();
+            total += remaining_documents_count;
+            if remaining_documents_count > 0 {
+                script_language_doc_count.push((script, language, remaining_documents_count));
+            }
+        }
+
+        let threshold = total / 20; // 5% (arbitrary)
+        for (script, language, count) in script_language_doc_count {
+            if count > threshold {
                 if let Some(languages) = script_language.get_mut(&script) {
                     (*languages).push(language);
                 } else {
@@ -1586,35 +1597,35 @@ pub(crate) mod tests {
 
         // match a document in the middle of the rectangle
         let search_result = search
-            .filter(Filter::from_str("_geoBoundingBox([10, -10], [-10, 10])").unwrap().unwrap())
+            .filter(Filter::from_str("_geoBoundingBox([10, 10], [-10, -10])").unwrap().unwrap())
             .execute()
             .unwrap();
         insta::assert_debug_snapshot!(search_result.candidates, @"RoaringBitmap<[0]>");
 
         // select everything
         let search_result = search
-            .filter(Filter::from_str("_geoBoundingBox([90, -180], [-90, 180])").unwrap().unwrap())
+            .filter(Filter::from_str("_geoBoundingBox([90, 180], [-90, -180])").unwrap().unwrap())
             .execute()
             .unwrap();
         insta::assert_debug_snapshot!(search_result.candidates, @"RoaringBitmap<[0, 1, 2, 3, 4]>");
 
         // go on the edge of the longitude
         let search_result = search
-            .filter(Filter::from_str("_geoBoundingBox([0, 180], [0, -170])").unwrap().unwrap())
+            .filter(Filter::from_str("_geoBoundingBox([0, -170], [0, 180])").unwrap().unwrap())
             .execute()
             .unwrap();
         insta::assert_debug_snapshot!(search_result.candidates, @"RoaringBitmap<[1]>");
 
         // go on the other edge of the longitude
         let search_result = search
-            .filter(Filter::from_str("_geoBoundingBox([0, 170], [0, -180])").unwrap().unwrap())
+            .filter(Filter::from_str("_geoBoundingBox([0, -180], [0, 170])").unwrap().unwrap())
             .execute()
             .unwrap();
         insta::assert_debug_snapshot!(search_result.candidates, @"RoaringBitmap<[2]>");
 
         // wrap around the longitude
         let search_result = search
-            .filter(Filter::from_str("_geoBoundingBox([0, 170], [0, -170])").unwrap().unwrap())
+            .filter(Filter::from_str("_geoBoundingBox([0, -170], [0, 170])").unwrap().unwrap())
             .execute()
             .unwrap();
         insta::assert_debug_snapshot!(search_result.candidates, @"RoaringBitmap<[1, 2]>");
@@ -1640,20 +1651,26 @@ pub(crate) mod tests {
             .filter(Filter::from_str("_geoBoundingBox([-80, 0], [80, 0])").unwrap().unwrap())
             .execute()
             .unwrap_err();
-        insta::assert_display_snapshot!(error, @r###"
+        insta::assert_display_snapshot!(
+            error,
+            @r###"
         The top latitude `-80` is below the bottom latitude `80`.
         32:33 _geoBoundingBox([-80, 0], [80, 0])
-        "###);
+        "###
+        );
 
         // send a top latitude lower than the bottow latitude
         let error = search
             .filter(Filter::from_str("_geoBoundingBox([-10, 0], [10, 0])").unwrap().unwrap())
             .execute()
             .unwrap_err();
-        insta::assert_display_snapshot!(error, @r###"
+        insta::assert_display_snapshot!(
+            error,
+            @r###"
         The top latitude `-10` is below the bottom latitude `10`.
         32:33 _geoBoundingBox([-10, 0], [10, 0])
-        "###);
+        "###
+        );
     }
 
     #[test]
diff --git a/milli/src/lib.rs b/milli/src/lib.rs
index eb63c3904..827ae3c9f 100644
--- a/milli/src/lib.rs
+++ b/milli/src/lib.rs
@@ -74,6 +74,7 @@ use std::collections::{BTreeMap, HashMap};
 use std::convert::{TryFrom, TryInto};
 use std::hash::BuildHasherDefault;
 
+use charabia::normalizer::{CharNormalizer, CompatibilityDecompositionNormalizer};
 pub use filter_parser::{Condition, FilterCondition, Span, Token};
 use fxhash::{FxHasher32, FxHasher64};
 pub use grenad::CompressionType;
@@ -323,6 +324,10 @@ pub fn is_faceted_by(field: &str, facet: &str) -> bool {
         && field[facet.len()..].chars().next().map(|c| c == '.').unwrap_or(true)
 }
 
+pub fn normalize_facet(original: &str) -> String {
+    CompatibilityDecompositionNormalizer.normalize_str(original.trim()).to_lowercase()
+}
+
 #[cfg(test)]
 mod tests {
     use serde_json::json;
diff --git a/milli/src/search/facet/filter.rs b/milli/src/search/facet/filter.rs
index a4ac53950..9a4aba9ba 100644
--- a/milli/src/search/facet/filter.rs
+++ b/milli/src/search/facet/filter.rs
@@ -54,8 +54,6 @@ impl Display for BadGeoError {
 enum FilterError<'a> {
     AttributeNotFilterable { attribute: &'a str, filterable_fields: HashSet<String> },
     ParseGeoError(BadGeoError),
-    ReservedGeo(&'a str),
-    Reserved(&'a str),
     TooDeep,
 }
 impl<'a> std::error::Error for FilterError<'a> {}
@@ -96,12 +94,6 @@ impl<'a> Display for FilterError<'a> {
                 "Too many filter conditions, can't process more than {} filters.",
                 MAX_FILTER_DEPTH
             ),
-            Self::ReservedGeo(keyword) => write!(f, "`{}` 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` field coordinates.", keyword),
-            Self::Reserved(keyword) => write!(
-                f,
-                "`{}` is a reserved keyword and thus can't be used as a filter expression.",
-                keyword
-            ),
             Self::ParseGeoError(error) => write!(f, "{}", error),
         }
     }
@@ -230,7 +222,7 @@ impl<'a> Filter<'a> {
                         &FacetGroupKey {
                             field_id,
                             level: 0,
-                            left_bound: &val.value().to_lowercase(),
+                            left_bound: &crate::normalize_facet(val.value()),
                         },
                     )?
                     .map(|v| v.bitmap)
@@ -332,23 +324,10 @@ impl<'a> Filter<'a> {
                         Ok(RoaringBitmap::new())
                     }
                 } else {
-                    match fid.value() {
-                        attribute @ "_geo" => {
-                            Err(fid.as_external_error(FilterError::ReservedGeo(attribute)))?
-                        }
-                        attribute if attribute.starts_with("_geoPoint(") => {
-                            Err(fid.as_external_error(FilterError::ReservedGeo("_geoPoint")))?
-                        }
-                        attribute @ "_geoDistance" => {
-                            Err(fid.as_external_error(FilterError::Reserved(attribute)))?
-                        }
-                        attribute => {
-                            Err(fid.as_external_error(FilterError::AttributeNotFilterable {
-                                attribute,
-                                filterable_fields: filterable_fields.clone(),
-                            }))?
-                        }
-                    }
+                    Err(fid.as_external_error(FilterError::AttributeNotFilterable {
+                        attribute: fid.value(),
+                        filterable_fields: filterable_fields.clone(),
+                    }))?
                 }
             }
             FilterCondition::Or(subfilters) => {
@@ -419,54 +398,56 @@ impl<'a> Filter<'a> {
                     }))?
                 }
             }
-            FilterCondition::GeoBoundingBox { top_left_point, bottom_right_point } => {
+            FilterCondition::GeoBoundingBox { top_right_point, bottom_left_point } => {
                 if filterable_fields.contains("_geo") {
-                    let top_left: [f64; 2] = [
-                        top_left_point[0].parse_finite_float()?,
-                        top_left_point[1].parse_finite_float()?,
+                    let top_right: [f64; 2] = [
+                        top_right_point[0].parse_finite_float()?,
+                        top_right_point[1].parse_finite_float()?,
                     ];
-                    let bottom_right: [f64; 2] = [
-                        bottom_right_point[0].parse_finite_float()?,
-                        bottom_right_point[1].parse_finite_float()?,
+                    let bottom_left: [f64; 2] = [
+                        bottom_left_point[0].parse_finite_float()?,
+                        bottom_left_point[1].parse_finite_float()?,
                     ];
-                    if !(-90.0..=90.0).contains(&top_left[0]) {
+                    if !(-90.0..=90.0).contains(&top_right[0]) {
                         return Err(
-                            top_left_point[0].as_external_error(BadGeoError::Lat(top_left[0]))
+                            top_right_point[0].as_external_error(BadGeoError::Lat(top_right[0]))
                         )?;
                     }
-                    if !(-180.0..=180.0).contains(&top_left[1]) {
+                    if !(-180.0..=180.0).contains(&top_right[1]) {
                         return Err(
-                            top_left_point[1].as_external_error(BadGeoError::Lng(top_left[1]))
+                            top_right_point[1].as_external_error(BadGeoError::Lng(top_right[1]))
                         )?;
                     }
-                    if !(-90.0..=90.0).contains(&bottom_right[0]) {
-                        return Err(bottom_right_point[0]
-                            .as_external_error(BadGeoError::Lat(bottom_right[0])))?;
+                    if !(-90.0..=90.0).contains(&bottom_left[0]) {
+                        return Err(bottom_left_point[0]
+                            .as_external_error(BadGeoError::Lat(bottom_left[0])))?;
                     }
-                    if !(-180.0..=180.0).contains(&bottom_right[1]) {
-                        return Err(bottom_right_point[1]
-                            .as_external_error(BadGeoError::Lng(bottom_right[1])))?;
+                    if !(-180.0..=180.0).contains(&bottom_left[1]) {
+                        return Err(bottom_left_point[1]
+                            .as_external_error(BadGeoError::Lng(bottom_left[1])))?;
                     }
-                    if top_left[0] < bottom_right[0] {
-                        return Err(bottom_right_point[1].as_external_error(
-                            BadGeoError::BoundingBoxTopIsBelowBottom(top_left[0], bottom_right[0]),
+                    if top_right[0] < bottom_left[0] {
+                        return Err(bottom_left_point[1].as_external_error(
+                            BadGeoError::BoundingBoxTopIsBelowBottom(top_right[0], bottom_left[0]),
                         ))?;
                     }
 
                     // Instead of writing a custom `GeoBoundingBox` filter we're simply going to re-use the range
                     // filter to create the following filter;
-                    // `_geo.lat {top_left[0]} TO {bottom_right[0]} AND _geo.lng {top_left[1]} TO {bottom_right[1]}`
+                    // `_geo.lat {top_right[0]} TO {bottom_left[0]} AND _geo.lng {top_right[1]} TO {bottom_left[1]}`
                     // As we can see, we need to use a bunch of tokens that don't exist in the original filter,
                     // thus we're going to create tokens that point to a random span but contain our text.
 
-                    let geo_lat_token =
-                        Token::new(top_left_point[0].original_span(), Some("_geo.lat".to_string()));
+                    let geo_lat_token = Token::new(
+                        top_right_point[0].original_span(),
+                        Some("_geo.lat".to_string()),
+                    );
 
                     let condition_lat = FilterCondition::Condition {
                         fid: geo_lat_token,
                         op: Condition::Between {
-                            from: bottom_right_point[0].clone(),
-                            to: top_left_point[0].clone(),
+                            from: bottom_left_point[0].clone(),
+                            to: top_right_point[0].clone(),
                         },
                     };
 
@@ -476,27 +457,29 @@ impl<'a> Filter<'a> {
                         filterable_fields,
                     )?;
 
-                    let geo_lng_token =
-                        Token::new(top_left_point[1].original_span(), Some("_geo.lng".to_string()));
-                    let selected_lng = if top_left[1] > bottom_right[1] {
+                    let geo_lng_token = Token::new(
+                        top_right_point[1].original_span(),
+                        Some("_geo.lng".to_string()),
+                    );
+                    let selected_lng = if top_right[1] < bottom_left[1] {
                         // In this case the bounding box is wrapping around the earth (going from 180 to -180).
                         // We need to update the lng part of the filter from;
-                        // `_geo.lng {top_left[1]} TO {bottom_right[1]}` to
-                        // `_geo.lng {top_left[1]} TO 180 AND _geo.lng -180 TO {bottom_right[1]}`
+                        // `_geo.lng {top_right[1]} TO {bottom_left[1]}` to
+                        // `_geo.lng {bottom_left[1]} TO 180 AND _geo.lng -180 TO {top_right[1]}`
 
                         let min_lng_token = Token::new(
-                            top_left_point[1].original_span(),
+                            top_right_point[1].original_span(),
                             Some("-180.0".to_string()),
                         );
                         let max_lng_token = Token::new(
-                            top_left_point[1].original_span(),
+                            top_right_point[1].original_span(),
                             Some("180.0".to_string()),
                         );
 
                         let condition_left = FilterCondition::Condition {
                             fid: geo_lng_token.clone(),
                             op: Condition::Between {
-                                from: top_left_point[1].clone(),
+                                from: bottom_left_point[1].clone(),
                                 to: max_lng_token,
                             },
                         };
@@ -510,7 +493,7 @@ impl<'a> Filter<'a> {
                             fid: geo_lng_token,
                             op: Condition::Between {
                                 from: min_lng_token,
-                                to: bottom_right_point[1].clone(),
+                                to: top_right_point[1].clone(),
                             },
                         };
                         let right = Filter { condition: condition_right }.inner_evaluate(
@@ -524,8 +507,8 @@ impl<'a> Filter<'a> {
                         let condition_lng = FilterCondition::Condition {
                             fid: geo_lng_token,
                             op: Condition::Between {
-                                from: top_left_point[1].clone(),
-                                to: bottom_right_point[1].clone(),
+                                from: bottom_left_point[1].clone(),
+                                to: top_right_point[1].clone(),
                             },
                         };
                         Filter { condition: condition_lng }.inner_evaluate(
@@ -537,10 +520,12 @@ impl<'a> Filter<'a> {
 
                     Ok(selected_lat & selected_lng)
                 } else {
-                    Err(top_left_point[0].as_external_error(FilterError::AttributeNotFilterable {
-                        attribute: "_geo",
-                        filterable_fields: filterable_fields.clone(),
-                    }))?
+                    Err(top_right_point[0].as_external_error(
+                        FilterError::AttributeNotFilterable {
+                            attribute: "_geo",
+                            filterable_fields: filterable_fields.clone(),
+                        },
+                    ))?
                 }
             }
         }
diff --git a/milli/src/search/new/query_term/parse_query.rs b/milli/src/search/new/query_term/parse_query.rs
index 7bcbeeff4..5663f6b4b 100644
--- a/milli/src/search/new/query_term/parse_query.rs
+++ b/milli/src/search/new/query_term/parse_query.rs
@@ -24,6 +24,9 @@ pub fn located_query_terms_from_string(
 
     let mut peekable = query.take(super::limits::MAX_TOKEN_COUNT).peekable();
     while let Some(token) = peekable.next() {
+        if token.lemma().is_empty() {
+            continue;
+        }
         // early return if word limit is exceeded
         if located_terms.len() >= parts_limit {
             return Ok(located_terms);
diff --git a/milli/src/update/index_documents/extract/extract_docid_word_positions.rs b/milli/src/update/index_documents/extract/extract_docid_word_positions.rs
index c362f8f1b..48850bd7e 100644
--- a/milli/src/update/index_documents/extract/extract_docid_word_positions.rs
+++ b/milli/src/update/index_documents/extract/extract_docid_word_positions.rs
@@ -3,12 +3,14 @@ use std::convert::TryInto;
 use std::fs::File;
 use std::{io, mem, str};
 
-use charabia::{Language, Script, SeparatorKind, Token, TokenKind, TokenizerBuilder};
+use charabia::{Language, Script, SeparatorKind, Token, TokenKind, Tokenizer, TokenizerBuilder};
+use obkv::KvReader;
 use roaring::RoaringBitmap;
 use serde_json::Value;
 
 use super::helpers::{concat_u32s_array, create_sorter, sorter_into_reader, GrenadParameters};
 use crate::error::{InternalError, SerializationError};
+use crate::update::index_documents::MergeFn;
 use crate::{
     absolute_from_relative_position, FieldId, Result, MAX_POSITION_PER_ATTRIBUTE, MAX_WORD_LENGTH,
 };
@@ -33,7 +35,7 @@ pub fn extract_docid_word_positions<R: io::Read + io::Seek>(
     let max_memory = indexer.max_memory_by_thread();
 
     let mut documents_ids = RoaringBitmap::new();
-    let mut script_language_pair = HashMap::new();
+    let mut script_language_docids = HashMap::new();
     let mut docid_word_positions_sorter = create_sorter(
         grenad::SortAlgorithm::Stable,
         concat_u32s_array,
@@ -43,13 +45,12 @@ pub fn extract_docid_word_positions<R: io::Read + io::Seek>(
         max_memory,
     );
 
-    let mut key_buffer = Vec::new();
-    let mut field_buffer = String::new();
-    let mut builder = TokenizerBuilder::new();
+    let mut buffers = Buffers::default();
+    let mut tokenizer_builder = TokenizerBuilder::new();
     if let Some(stop_words) = stop_words {
-        builder.stop_words(stop_words);
+        tokenizer_builder.stop_words(stop_words);
     }
-    let tokenizer = builder.build();
+    let tokenizer = tokenizer_builder.build();
 
     let mut cursor = obkv_documents.into_cursor()?;
     while let Some((key, value)) = cursor.move_on_next()? {
@@ -57,49 +58,122 @@ pub fn extract_docid_word_positions<R: io::Read + io::Seek>(
             .try_into()
             .map(u32::from_be_bytes)
             .map_err(|_| SerializationError::InvalidNumberSerialization)?;
-        let obkv = obkv::KvReader::<FieldId>::new(value);
+        let obkv = KvReader::<FieldId>::new(value);
 
         documents_ids.push(document_id);
-        key_buffer.clear();
-        key_buffer.extend_from_slice(&document_id.to_be_bytes());
+        buffers.key_buffer.clear();
+        buffers.key_buffer.extend_from_slice(&document_id.to_be_bytes());
 
-        for (field_id, field_bytes) in obkv.iter() {
-            if searchable_fields.as_ref().map_or(true, |sf| sf.contains(&field_id)) {
-                let value =
-                    serde_json::from_slice(field_bytes).map_err(InternalError::SerdeJson)?;
-                field_buffer.clear();
-                if let Some(field) = json_to_string(&value, &mut field_buffer) {
-                    let tokens = process_tokens(tokenizer.tokenize(field))
-                        .take_while(|(p, _)| (*p as u32) < max_positions_per_attributes);
+        let mut script_language_word_count = HashMap::new();
 
-                    for (index, token) in tokens {
-                        if let Some(language) = token.language {
-                            let script = token.script;
-                            let entry = script_language_pair
-                                .entry((script, language))
-                                .or_insert_with(RoaringBitmap::new);
-                            entry.push(document_id);
+        extract_tokens_from_document(
+            &obkv,
+            searchable_fields,
+            &tokenizer,
+            max_positions_per_attributes,
+            &mut buffers,
+            &mut script_language_word_count,
+            &mut docid_word_positions_sorter,
+        )?;
+
+        // if we detect a potetial mistake in the language detection,
+        // we rerun the extraction forcing the tokenizer to detect the most frequently detected Languages.
+        // context: https://github.com/meilisearch/meilisearch/issues/3565
+        if script_language_word_count
+            .values()
+            .map(Vec::as_slice)
+            .any(potential_language_detection_error)
+        {
+            // build an allow list with the most frequent detected languages in the document.
+            let script_language: HashMap<_, _> =
+                script_language_word_count.iter().filter_map(most_frequent_languages).collect();
+
+            // if the allow list is empty, meaning that no Language is considered frequent,
+            // then we don't rerun the extraction.
+            if !script_language.is_empty() {
+                // build a new temporary tokenizer including the allow list.
+                let mut tokenizer_builder = TokenizerBuilder::new();
+                if let Some(stop_words) = stop_words {
+                    tokenizer_builder.stop_words(stop_words);
+                }
+                tokenizer_builder.allow_list(&script_language);
+                let tokenizer = tokenizer_builder.build();
+
+                script_language_word_count.clear();
+
+                // rerun the extraction.
+                extract_tokens_from_document(
+                    &obkv,
+                    searchable_fields,
+                    &tokenizer,
+                    max_positions_per_attributes,
+                    &mut buffers,
+                    &mut script_language_word_count,
+                    &mut docid_word_positions_sorter,
+                )?;
+            }
+        }
+
+        for (script, languages_frequency) in script_language_word_count {
+            for (language, _) in languages_frequency {
+                let entry = script_language_docids
+                    .entry((script, language))
+                    .or_insert_with(RoaringBitmap::new);
+                entry.push(document_id);
+            }
+        }
+    }
+
+    sorter_into_reader(docid_word_positions_sorter, indexer)
+        .map(|reader| (documents_ids, reader, script_language_docids))
+}
+
+fn extract_tokens_from_document<T: AsRef<[u8]>>(
+    obkv: &KvReader<FieldId>,
+    searchable_fields: &Option<HashSet<FieldId>>,
+    tokenizer: &Tokenizer<T>,
+    max_positions_per_attributes: u32,
+    buffers: &mut Buffers,
+    script_language_word_count: &mut HashMap<Script, Vec<(Language, usize)>>,
+    docid_word_positions_sorter: &mut grenad::Sorter<MergeFn>,
+) -> Result<()> {
+    for (field_id, field_bytes) in obkv.iter() {
+        if searchable_fields.as_ref().map_or(true, |sf| sf.contains(&field_id)) {
+            let value = serde_json::from_slice(field_bytes).map_err(InternalError::SerdeJson)?;
+            buffers.field_buffer.clear();
+            if let Some(field) = json_to_string(&value, &mut buffers.field_buffer) {
+                let tokens = process_tokens(tokenizer.tokenize(field))
+                    .take_while(|(p, _)| (*p as u32) < max_positions_per_attributes);
+
+                for (index, token) in tokens {
+                    // if a language has been detected for the token, we update the counter.
+                    if let Some(language) = token.language {
+                        let script = token.script;
+                        let entry =
+                            script_language_word_count.entry(script).or_insert_with(Vec::new);
+                        match entry.iter_mut().find(|(l, _)| *l == language) {
+                            Some((_, n)) => *n += 1,
+                            None => entry.push((language, 1)),
                         }
-                        let token = token.lemma().trim();
-                        if !token.is_empty() && token.len() <= MAX_WORD_LENGTH {
-                            key_buffer.truncate(mem::size_of::<u32>());
-                            key_buffer.extend_from_slice(token.as_bytes());
+                    }
+                    let token = token.lemma().trim();
+                    if !token.is_empty() && token.len() <= MAX_WORD_LENGTH {
+                        buffers.key_buffer.truncate(mem::size_of::<u32>());
+                        buffers.key_buffer.extend_from_slice(token.as_bytes());
 
-                            let position: u16 = index
-                                .try_into()
-                                .map_err(|_| SerializationError::InvalidNumberSerialization)?;
-                            let position = absolute_from_relative_position(field_id, position);
-                            docid_word_positions_sorter
-                                .insert(&key_buffer, position.to_ne_bytes())?;
-                        }
+                        let position: u16 = index
+                            .try_into()
+                            .map_err(|_| SerializationError::InvalidNumberSerialization)?;
+                        let position = absolute_from_relative_position(field_id, position);
+                        docid_word_positions_sorter
+                            .insert(&buffers.key_buffer, position.to_ne_bytes())?;
                     }
                 }
             }
         }
     }
 
-    sorter_into_reader(docid_word_positions_sorter, indexer)
-        .map(|reader| (documents_ids, reader, script_language_pair))
+    Ok(())
 }
 
 /// Transform a JSON value into a string that can be indexed.
@@ -183,3 +257,46 @@ fn process_tokens<'a>(
         })
         .filter(|(_, t)| t.is_word())
 }
+
+fn potential_language_detection_error(languages_frequency: &[(Language, usize)]) -> bool {
+    if languages_frequency.len() > 1 {
+        let threshold = compute_language_frequency_threshold(languages_frequency);
+        languages_frequency.iter().any(|(_, c)| *c <= threshold)
+    } else {
+        false
+    }
+}
+
+fn most_frequent_languages(
+    (script, languages_frequency): (&Script, &Vec<(Language, usize)>),
+) -> Option<(Script, Vec<Language>)> {
+    if languages_frequency.len() > 1 {
+        let threshold = compute_language_frequency_threshold(languages_frequency);
+
+        let languages: Vec<_> =
+            languages_frequency.iter().filter(|(_, c)| *c > threshold).map(|(l, _)| *l).collect();
+
+        if languages.is_empty() {
+            None
+        } else {
+            Some((*script, languages))
+        }
+    } else {
+        None
+    }
+}
+
+fn compute_language_frequency_threshold(languages_frequency: &[(Language, usize)]) -> usize {
+    let total: usize = languages_frequency.iter().map(|(_, c)| c).sum();
+    total / 10 // 10% is a completely arbitrary value.
+}
+
+#[derive(Default)]
+struct Buffers {
+    // the key buffer is the concatenation of the internal document id with the field id.
+    // The buffer has to be completelly cleared between documents,
+    // and the field id part must be cleared between each field.
+    key_buffer: Vec<u8>,
+    // the field buffer for each fields desserialization, and must be cleared between each field.
+    field_buffer: String,
+}
diff --git a/milli/src/update/index_documents/extract/extract_fid_docid_facet_values.rs b/milli/src/update/index_documents/extract/extract_fid_docid_facet_values.rs
index 71ac330e2..f0bd78792 100644
--- a/milli/src/update/index_documents/extract/extract_fid_docid_facet_values.rs
+++ b/milli/src/update/index_documents/extract/extract_fid_docid_facet_values.rs
@@ -4,7 +4,6 @@ use std::fs::File;
 use std::io;
 use std::mem::size_of;
 
-use charabia::normalizer::{CharNormalizer, CompatibilityDecompositionNormalizer};
 use heed::zerocopy::AsBytes;
 use heed::BytesEncode;
 use roaring::RoaringBitmap;
@@ -136,9 +135,7 @@ fn extract_facet_values(value: &Value) -> (Vec<f64>, Vec<(String, String)>) {
                 }
             }
             Value::String(original) => {
-                let normalized = CompatibilityDecompositionNormalizer
-                    .normalize_str(original.trim())
-                    .to_lowercase();
+                let normalized = crate::normalize_facet(original);
                 output_strings.push((normalized, original.clone()));
             }
             Value::Array(values) => {
diff --git a/milli/src/update/settings.rs b/milli/src/update/settings.rs
index 4f4fa25d6..3e271924b 100644
--- a/milli/src/update/settings.rs
+++ b/milli/src/update/settings.rs
@@ -565,8 +565,12 @@ impl<'a, 't, 'u, 'i> Settings<'a, 't, 'u, 'i> {
                     self.index.put_primary_key(self.wtxn, primary_key)?;
                     Ok(())
                 } else {
-                    let primary_key = self.index.primary_key(self.wtxn)?.unwrap();
-                    Err(UserError::PrimaryKeyCannotBeChanged(primary_key.to_string()).into())
+                    let curr_primary_key = self.index.primary_key(self.wtxn)?.unwrap().to_string();
+                    if primary_key == &curr_primary_key {
+                        Ok(())
+                    } else {
+                        Err(UserError::PrimaryKeyCannotBeChanged(curr_primary_key).into())
+                    }
                 }
             }
             Setting::Reset => {
@@ -1332,6 +1336,17 @@ mod tests {
             .unwrap();
         wtxn.commit().unwrap();
 
+        // Updating settings with the same primary key should do nothing
+        let mut wtxn = index.write_txn().unwrap();
+        index
+            .update_settings_using_wtxn(&mut wtxn, |settings| {
+                settings.set_primary_key(S("mykey"));
+            })
+            .unwrap();
+        assert_eq!(index.primary_key(&wtxn).unwrap(), Some("mykey"));
+        wtxn.commit().unwrap();
+
+        // Updating the settings with a different (or no) primary key causes an error
         let mut wtxn = index.write_txn().unwrap();
         let error = index
             .update_settings_using_wtxn(&mut wtxn, |settings| {