diff --git a/chronik/chronik-db/src/io/blocks.rs b/chronik/chronik-db/src/io/blocks.rs
--- a/chronik/chronik-db/src/io/blocks.rs
+++ b/chronik/chronik-db/src/io/blocks.rs
@@ -181,7 +181,7 @@
             CF_BLK,
             rocksdb::Options::default(),
         ));
-        LookupByHash::add_cfs(columns, CF_LOOKUP_BLK_BY_HASH);
+        LookupByHash::add_cfs(columns);
     }
 }
 
@@ -238,8 +238,9 @@
 
     /// [`DbBlock`] by height. The genesis block has height 0.
     pub fn by_height(&self, height: BlockHeight) -> Result<Option<DbBlock>> {
-        let Some(block_data) = self.col.get_block(height)?
-            else { return Ok(None) };
+        let Some(block_data) = self.col.get_block(height)? else {
+            return Ok(None);
+        };
         let prev_block_hash = self.get_prev_hash(height)?;
         Ok(Some(DbBlock {
             hash: BlockHash::from(block_data.hash),
diff --git a/chronik/chronik-db/src/io/txs.rs b/chronik/chronik-db/src/io/txs.rs
--- a/chronik/chronik-db/src/io/txs.rs
+++ b/chronik/chronik-db/src/io/txs.rs
@@ -323,7 +323,7 @@
             CF_FIRST_TX_BY_BLK,
             Options::default(),
         ));
-        LookupByHash::add_cfs(columns, CF_LOOKUP_TX_BY_HASH);
+        LookupByHash::add_cfs(columns);
     }
 }
 
diff --git a/chronik/chronik-db/src/reverse_lookup.rs b/chronik/chronik-db/src/reverse_lookup.rs
--- a/chronik/chronik-db/src/reverse_lookup.rs
+++ b/chronik/chronik-db/src/reverse_lookup.rs
@@ -120,14 +120,9 @@
 
 impl<L: LookupColumn> ReverseLookup<L> {
     /// Add the cfs required by the reverse lookup index.
-    pub(crate) fn add_cfs(
-        columns: &mut Vec<ColumnFamilyDescriptor>,
-        lookup_cf_name: &'static str,
-    ) {
-        columns.push(ColumnFamilyDescriptor::new(
-            lookup_cf_name,
-            Options::default(),
-        ));
+    pub(crate) fn add_cfs(columns: &mut Vec<ColumnFamilyDescriptor>) {
+        columns
+            .push(ColumnFamilyDescriptor::new(L::CF_INDEX, Options::default()));
     }
 
     /// Read by key from the DB using the index.
@@ -310,7 +305,7 @@
         let tempdir = tempdir::TempDir::new("chronik-db--lookup")?;
         let mut cfs =
             vec![ColumnFamilyDescriptor::new(CF_TEST, Options::default())];
-        Index::add_cfs(&mut cfs, CF_TEST_INDEX);
+        Index::add_cfs(&mut cfs);
         let db = Db::open_with_cfs(tempdir.path(), cfs)?;
         let cf_data = db.cf(CF_TEST)?;
         let column = TestColumn { db: &db, cf_data };
@@ -460,7 +455,7 @@
         let tempdir = tempdir::TempDir::new("chronik-db--lookup_rng")?;
         let mut cfs =
             vec![ColumnFamilyDescriptor::new(CF_TEST, Options::default())];
-        Index::add_cfs(&mut cfs, CF_TEST_INDEX);
+        Index::add_cfs(&mut cfs);
         let db = Db::open_with_cfs(tempdir.path(), cfs)?;
         let cf_data = db.cf(CF_TEST)?;
         let column = TestColumn { db: &db, cf_data };