diff --git a/src/hooks/useStreamPosts.ts b/src/hooks/useStreamPosts.ts
index 10946cac..54dd3a72 100644
--- a/src/hooks/useStreamPosts.ts
+++ b/src/hooks/useStreamPosts.ts
@@ -7,14 +7,18 @@ interface StreamPostsOptions {
   mediaType: 'all' | 'images' | 'videos' | 'vines' | 'none';
 }
 
-function extractImages(content: string): string[] {
-  const urlRegex = /https?:\/\/[^\s]+\.(jpg|jpeg|png|gif|webp|svg)(\?[^\s]*)?/gi;
-  return content.match(urlRegex) || [];
+/** Check if an event has imeta tags with image MIME types. */
+function hasImageImeta(event: NostrEvent): boolean {
+  return event.tags.some(
+    (tag) => tag[0] === 'imeta' && tag.slice(1).some((part) => part.startsWith('m ') && part.split(' ')[1]?.startsWith('image/')),
+  );
 }
 
-function extractVideos(content: string): string[] {
-  const urlRegex = /https?:\/\/[^\s]+\.(mp4|webm|mov|avi|mkv)(\?[^\s]*)?/gi;
-  return content.match(urlRegex) || [];
+/** Check if an event has imeta tags with video MIME types. */
+function hasVideoImeta(event: NostrEvent): boolean {
+  return event.tags.some(
+    (tag) => tag[0] === 'imeta' && tag.slice(1).some((part) => part.startsWith('m ') && part.split(' ')[1]?.startsWith('video/')),
+  );
 }
 
 function filterEvent(event: NostrEvent, options: StreamPostsOptions): boolean {
@@ -29,8 +33,8 @@ function filterEvent(event: NostrEvent, options: StreamPostsOptions): boolean {
   }
 
   if (options.mediaType !== 'all') {
-    const hasImages = extractImages(event.content).length > 0;
-    const hasVideos = extractVideos(event.content).length > 0;
+    const hasImages = hasImageImeta(event);
+    const hasVideos = hasVideoImeta(event);
     switch (options.mediaType) {
       case 'images': return hasImages;
       case 'videos': return hasVideos;
diff --git a/src/pages/SearchPage.tsx b/src/pages/SearchPage.tsx
index 37a80ac9..7d4a1060 100644
--- a/src/pages/SearchPage.tsx
+++ b/src/pages/SearchPage.tsx
@@ -106,8 +106,8 @@ export function SearchPage() {
                       {[
                         { value: 'all', label: 'All media' },
                         { value: 'images', label: 'Images' },
-                        { value: 'videos', label: 'Regular videos' },
-                        { value: 'vines', label: 'Short videos (Vines)' },
+                        { value: 'videos', label: 'Videos' },
+                        { value: 'vines', label: 'Vines' },
                         { value: 'none', label: 'No media' },
                       ].map(({ value, label }) => (
                         <div key={value} className="flex items-center space-x-1.5">