diff --git a/src/indexer/index_writer.rs b/src/indexer/index_writer.rs
index 619fa4a7b..ba57fce36 100644
--- a/src/indexer/index_writer.rs
+++ b/src/indexer/index_writer.rs
@@ -1780,6 +1780,7 @@ mod tests {
                 segment_reader.doc_ids_alive().flat_map(move |doc| {
                     let val = ff_reader.get_val(doc as u64);
                     if val == IpAddr::from_u128(0) {
+                        // TODO Fix null handling
                         None
                     } else {
                         Some(val)
@@ -1818,7 +1819,7 @@ mod tests {
                 segment_reader.doc_ids_alive().flat_map(move |doc| {
                     let mut vals = vec![];
                     ff_reader.get_vals(doc, &mut vals);
-                    vals.into_iter().filter(|val| val.to_u128() != 0)
+                    vals.into_iter().filter(|val| val.to_u128() != 0) // TODO Fix null handling
                 })
             })
             .collect();
diff --git a/src/indexer/merger.rs b/src/indexer/merger.rs
index c16bfc22d..5ea5b5da1 100644
--- a/src/indexer/merger.rs
+++ b/src/indexer/merger.rs
@@ -11,8 +11,8 @@ use crate::core::{Segment, SegmentReader};
 use crate::docset::{DocSet, TERMINATED};
 use crate::error::DataCorruption;
 use crate::fastfield::{
-    get_fastfield_codecs_for_multivalue, AliveBitSet, Column, CompositeFastFieldSerializer, MultiValueLength,
-    MultiValuedFastFieldReader, MultiValuedU128FastFieldReader,
+    get_fastfield_codecs_for_multivalue, AliveBitSet, Column, CompositeFastFieldSerializer,
+    MultiValueLength, MultiValuedFastFieldReader, MultiValuedU128FastFieldReader,
 };
 use crate::fieldnorm::{FieldNormReader, FieldNormReaders, FieldNormsSerializer, FieldNormsWriter};
 use crate::indexer::doc_id_mapping::{expect_field_id_for_sort_field, SegmentDocIdMapping};