diff --git a/plugins/catalog-backend/src/database/metrics.ts b/plugins/catalog-backend/src/database/metrics.ts
index e7032d8263..d8cd87558f 100644
--- a/plugins/catalog-backend/src/database/metrics.ts
+++ b/plugins/catalog-backend/src/database/metrics.ts
@@ -31,9 +31,9 @@ export function initDatabaseMetrics(knex: Knex) {
       async collect() {
         const results = await knex<DbSearchRow>('search')
           .where('key', '=', 'kind')
-          .whereNotNull('original_value')
-          .select({ kind: 'original_value', count: knex.raw('count(*)') })
-          .groupBy('original_value');
+          .whereNotNull('value')
+          .select({ kind: 'value', count: knex.raw('count(*)') })
+          .groupBy('value');
 
         results.forEach(({ kind, count }) => {
           seenProm.add(kind);
@@ -76,9 +76,9 @@ export function initDatabaseMetrics(knex: Knex) {
       .addCallback(async gauge => {
         const results = await knex<DbSearchRow>('search')
           .where('key', '=', 'kind')
-          .whereNotNull('original_value')
-          .select({ kind: 'original_value', count: knex.raw('count(*)') })
-          .groupBy('original_value');
+          .whereNotNull('value')
+          .select({ kind: 'value', count: knex.raw('count(*)') })
+          .groupBy('value');
 
         results.forEach(({ kind, count }) => {
           seen.add(kind);