diff --git a/milli/src/search/new/db_cache.rs b/milli/src/search/new/db_cache.rs
index 24c7d5076..b7a74fb62 100644
--- a/milli/src/search/new/db_cache.rs
+++ b/milli/src/search/new/db_cache.rs
@@ -263,6 +263,7 @@ impl<'ctx> SearchContext<'ctx> {
         word2: Interned<String>,
         proximity: u8,
     ) -> Result<Option<RoaringBitmap>> {
+        // TODO: if database is empty, search if the word are in the same attribute instead
         DatabaseCache::get_value::<_, _, CboRoaringBitmapCodec>(
             self.txn,
             (proximity, word1, word2),
@@ -282,6 +283,7 @@ impl<'ctx> SearchContext<'ctx> {
         word2: Interned<String>,
         proximity: u8,
     ) -> Result<Option<u64>> {
+        // TODO: if database is empty, search if the word are in the same attribute instead
         DatabaseCache::get_value::<_, _, CboRoaringBitmapLenCodec>(
             self.txn,
             (proximity, word1, word2),
@@ -301,6 +303,7 @@ impl<'ctx> SearchContext<'ctx> {
         prefix2: Interned<String>,
         proximity: u8,
     ) -> Result<Option<RoaringBitmap>> {
+        // TODO: if database is empty, search if the word are in the same attribute instead
         let docids = match self
             .db_cache
             .word_prefix_pair_proximity_docids
diff --git a/milli/src/update/index_documents/extract/mod.rs b/milli/src/update/index_documents/extract/mod.rs
index 91f3e1c62..366e61c04 100644
--- a/milli/src/update/index_documents/extract/mod.rs
+++ b/milli/src/update/index_documents/extract/mod.rs
@@ -52,6 +52,7 @@ pub(crate) fn data_from_obkv_documents(
     dictionary: Option<&[&str]>,
     max_positions_per_attributes: Option<u32>,
     exact_attributes: HashSet<FieldId>,
+    // TODO: add a proximity database deactivation parameter.
 ) -> Result<()> {
     puffin::profile_function!();
 
@@ -150,6 +151,7 @@ pub(crate) fn data_from_obkv_documents(
         });
     }
 
+    // TODO: Skip this part if deactivated
     spawn_extraction_task::<_, _, Vec<grenad::Reader<BufReader<File>>>>(
         docid_word_positions_chunks.clone(),
         indexer,
diff --git a/milli/src/update/settings.rs b/milli/src/update/settings.rs
index 98697325e..0a069c6df 100644
--- a/milli/src/update/settings.rs
+++ b/milli/src/update/settings.rs
@@ -127,6 +127,7 @@ pub struct Settings<'a, 't, 'i> {
     max_values_per_facet: Setting<usize>,
     sort_facet_values_by: Setting<HashMap<String, OrderBy>>,
     pagination_max_total_hits: Setting<usize>,
+    // TODO: add a proximity database deactivation attribute.
 }
 
 impl<'a, 't, 'i> Settings<'a, 't, 'i> {
@@ -906,6 +907,7 @@ impl<'a, 't, 'i> Settings<'a, 't, 'i> {
             || synonyms_updated
             || searchable_updated
             || exact_attributes_updated
+        // TODO: reindex if proximity database is activated
         {
             self.reindex(&progress_callback, &should_abort, old_fields_ids_map)?;
         }