diff --git a/src/stream/stream.ts b/src/stream/stream.ts
index fdc4f9b206..505fda545b 100644
--- a/src/stream/stream.ts
+++ b/src/stream/stream.ts
@@ -365,6 +365,10 @@ export function includesSubstring(value: PartitionConsumeRecord, query: RegExp):
   if (key != null && query.test(key)) return true;
   let val = value.value as any;
   if (val != null && query.test(val)) return true;
+  let offset = value.offset as any;
+  if (offset != null && query.test(offset)) return true;
+  let metadata = value.metadata as any;
+  if (metadata != null && query.test(JSON.stringify(metadata))) return true;
   return false;
 }
 
diff --git a/src/webview/message-viewer.ts b/src/webview/message-viewer.ts
index d0dd643e91..9f7a62dfdf 100644
--- a/src/webview/message-viewer.ts
+++ b/src/webview/message-viewer.ts
@@ -321,7 +321,8 @@ class MessageViewerViewModel extends ViewModel {
     offset: {
       index: 2,
       title: () => "Offset",
-      children: (message: PartitionConsumeRecord) => message.offset,
+      children: (message: PartitionConsumeRecord) =>
+        this.formatMessageValue(message.offset, this.searchRegexp()),
       description: (message: PartitionConsumeRecord) => message.offset,
     },
     key: {