diff --git a/assets/components/LogViewer/ComplexLogItem.vue b/assets/components/LogViewer/ComplexLogItem.vue
index 6c8734c8..e22d0b96 100644
--- a/assets/components/LogViewer/ComplexLogItem.vue
+++ b/assets/components/LogViewer/ComplexLogItem.vue
@@ -1,6 +1,6 @@
 <template>
   <LogItem :logEntry @click="showDrawer(LogDetails, { entry: logEntry })" class="clickable">
-    <ul class="space-x-4">
+    <ul class="space-x-4" @click="preventDefaultOnLinks">
       <li v-for="(value, name) in validValues" :key="name" class="inline-flex">
         <span class="text-light">{{ name }}=</span><span class="font-bold" v-if="value === null">&lt;null&gt;</span>
         <template v-else-if="Array.isArray(value)">
@@ -27,6 +27,11 @@ const validValues = computed(() => {
 });
 
 const showDrawer = useDrawer();
+function preventDefaultOnLinks(event: MouseEvent) {
+  if (event.target instanceof HTMLAnchorElement && event.target.rel?.includes("external")) {
+    event.stopImmediatePropagation();
+  }
+}
 </script>
 
 <style scoped>
diff --git a/assets/components/LogViewer/EventSource.spec.ts b/assets/components/LogViewer/EventSource.spec.ts
index 15d7d074..55240280 100644
--- a/assets/components/LogViewer/EventSource.spec.ts
+++ b/assets/components/LogViewer/EventSource.spec.ts
@@ -160,7 +160,7 @@ describe("<ContainerEventSource />", () => {
       vi.runAllTimers();
       await nextTick();
 
-      expect(wrapper.find("ul.events").html()).toMatchSnapshot();
+      expect(wrapper.find("ul[data-logs]").html()).toMatchSnapshot();
     });
 
     test("should render dates with 12 hour style", async () => {
@@ -173,7 +173,7 @@ describe("<ContainerEventSource />", () => {
       vi.runAllTimers();
       await nextTick();
 
-      expect(wrapper.find("ul.events").html()).toMatchSnapshot();
+      expect(wrapper.find("ul[data-logs]").html()).toMatchSnapshot();
     });
 
     test("should render dates with 24 hour style", async () => {
@@ -186,7 +186,7 @@ describe("<ContainerEventSource />", () => {
       vi.runAllTimers();
       await nextTick();
 
-      expect(wrapper.find("ul.events").html()).toMatchSnapshot();
+      expect(wrapper.find("ul[data-logs]").html()).toMatchSnapshot();
     });
   });
 });
diff --git a/assets/components/LogViewer/LogList.vue b/assets/components/LogViewer/LogList.vue
index 6c8d32a7..f9e6cd70 100644
--- a/assets/components/LogViewer/LogList.vue
+++ b/assets/components/LogViewer/LogList.vue
@@ -1,5 +1,5 @@
 <template>
-  <ul class="events group pt-4" :class="{ 'disable-wrap': !softWrap, [size]: true, compact }">
+  <ul class="group pt-4" :class="{ 'disable-wrap': !softWrap, [size]: true, compact }" data-logs>
     <li
       v-for="item in messages"
       ref="list"
@@ -55,7 +55,7 @@ useIntersectionObserver(
 </script>
 <style scoped>
 @reference "@/main.css";
-.events {
+ul {
   font-family:
     ui-monospace,
     SFMono-Regular,
@@ -99,6 +99,10 @@ useIntersectionObserver(
     @apply bg-secondary inline-block rounded-xs;
     animation: pops 200ms ease-out;
   }
+
+  :deep(a[rel~="external"]) {
+    @apply text-primary underline-offset-4 hover:underline;
+  }
 }
 
 @keyframes pops {
diff --git a/assets/components/LogViewer/SimpleLogItem.vue b/assets/components/LogViewer/SimpleLogItem.vue
index f3c46176..78c48a4a 100644
--- a/assets/components/LogViewer/SimpleLogItem.vue
+++ b/assets/components/LogViewer/SimpleLogItem.vue
@@ -1,8 +1,8 @@
 <template>
   <LogItem :logEntry>
     <div
-      class="log-wrapper [word-break:break-word] whitespace-pre-wrap group-[.disable-wrap]:whitespace-nowrap"
-      v-html="linkify(colorize(logEntry.message))"
+      class="[word-break:break-word] whitespace-pre-wrap group-[.disable-wrap]:whitespace-nowrap"
+      v-html="colorize(logEntry.message)"
     ></div>
     <LogMessageActions
       class="absolute -right-1 opacity-0 transition-opacity delay-150 duration-250 group-hover/entry:opacity-100"
@@ -28,15 +28,4 @@ defineProps<{
 }>();
 
 const colorize = (value: string) => ansiConvertor.toHtml(value);
-const urlPattern =
-  /https?:\/\/(?:www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b[-a-zA-Z0-9()@:%_+.~#?&/=]*/g;
-const linkify = (text: string) =>
-  text.replace(urlPattern, (url) => `<a href="${url}" target="_blank" rel="noopener noreferrer">${url}</a>`);
 </script>
-
-<style scoped>
-@reference "@/main.css";
-.log-wrapper :deep(a) {
-  @apply text-primary underline-offset-4 hover:underline;
-}
-</style>
diff --git a/assets/components/LogViewer/__snapshots__/EventSource.spec.ts.snap b/assets/components/LogViewer/__snapshots__/EventSource.spec.ts.snap
index 6283410d..4fb3d3fc 100644
--- a/assets/components/LogViewer/__snapshots__/EventSource.spec.ts.snap
+++ b/assets/components/LogViewer/__snapshots__/EventSource.spec.ts.snap
@@ -1,9 +1,9 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`<ContainerEventSource /> > render html correctly > should render dates with 12 hour style 1`] = `
-"<ul data-v-cf9ff940="" class="events group pt-4 medium" show-container-name="false">
+"<ul data-v-cf9ff940="" class="group pt-4 medium" data-logs="" show-container-name="false">
   <li data-v-cf9ff940="" data-key="1" data-time="1560336942459" class="group/entry">
-    <div data-v-a49e52d4="" data-v-cf9ff940="" class="relative flex w-full items-start gap-x-2 group-[.compact]:items-stretch">
+    <div data-v-cf9ff940="" class="relative flex w-full items-start gap-x-2 group-[.compact]:items-stretch">
       <!--v-if-->
       <div class="flex gap-x-2 gap-y-1 group-[.compact]:gap-y-0 has-[>_*:nth-of-type(2)]:flex-col-reverse md:flex-row!">
         <!--v-if-->
@@ -13,8 +13,8 @@ exports[`<ContainerEventSource /> > render html correctly > should render dates
         </div>
       </div>
       <div data-v-e625cddd="" class="mt-1.5 size-2.5 flex-none rounded-lg flex select-none"></div>
-      <div data-v-a49e52d4="" class="log-wrapper [word-break:break-word] whitespace-pre-wrap group-[.disable-wrap]:whitespace-nowrap">foo bar</div>
-      <div data-v-a49e52d4="" class="flex gap-2 absolute -right-1 opacity-0 transition-opacity delay-150 duration-250 group-hover/entry:opacity-100">
+      <div class="[word-break:break-word] whitespace-pre-wrap group-[.disable-wrap]:whitespace-nowrap">foo bar</div>
+      <div class="flex gap-2 absolute -right-1 opacity-0 transition-opacity delay-150 duration-250 group-hover/entry:opacity-100">
         <!--v-if-->
       </div>
     </div>
@@ -23,9 +23,9 @@ exports[`<ContainerEventSource /> > render html correctly > should render dates
 `;
 
 exports[`<ContainerEventSource /> > render html correctly > should render dates with 24 hour style 1`] = `
-"<ul data-v-cf9ff940="" class="events group pt-4 medium" show-container-name="false">
+"<ul data-v-cf9ff940="" class="group pt-4 medium" data-logs="" show-container-name="false">
   <li data-v-cf9ff940="" data-key="1" data-time="1560336942459" class="group/entry">
-    <div data-v-a49e52d4="" data-v-cf9ff940="" class="relative flex w-full items-start gap-x-2 group-[.compact]:items-stretch">
+    <div data-v-cf9ff940="" class="relative flex w-full items-start gap-x-2 group-[.compact]:items-stretch">
       <!--v-if-->
       <div class="flex gap-x-2 gap-y-1 group-[.compact]:gap-y-0 has-[>_*:nth-of-type(2)]:flex-col-reverse md:flex-row!">
         <!--v-if-->
@@ -35,8 +35,8 @@ exports[`<ContainerEventSource /> > render html correctly > should render dates
         </div>
       </div>
       <div data-v-e625cddd="" class="mt-1.5 size-2.5 flex-none rounded-lg flex select-none"></div>
-      <div data-v-a49e52d4="" class="log-wrapper [word-break:break-word] whitespace-pre-wrap group-[.disable-wrap]:whitespace-nowrap">foo bar</div>
-      <div data-v-a49e52d4="" class="flex gap-2 absolute -right-1 opacity-0 transition-opacity delay-150 duration-250 group-hover/entry:opacity-100">
+      <div class="[word-break:break-word] whitespace-pre-wrap group-[.disable-wrap]:whitespace-nowrap">foo bar</div>
+      <div class="flex gap-2 absolute -right-1 opacity-0 transition-opacity delay-150 duration-250 group-hover/entry:opacity-100">
         <!--v-if-->
       </div>
     </div>
@@ -45,9 +45,9 @@ exports[`<ContainerEventSource /> > render html correctly > should render dates
 `;
 
 exports[`<ContainerEventSource /> > render html correctly > should render messages 1`] = `
-"<ul data-v-cf9ff940="" class="events group pt-4 medium" show-container-name="false">
+"<ul data-v-cf9ff940="" class="group pt-4 medium" data-logs="" show-container-name="false">
   <li data-v-cf9ff940="" data-key="1" data-time="1560336942459" class="group/entry">
-    <div data-v-a49e52d4="" data-v-cf9ff940="" class="relative flex w-full items-start gap-x-2 group-[.compact]:items-stretch">
+    <div data-v-cf9ff940="" class="relative flex w-full items-start gap-x-2 group-[.compact]:items-stretch">
       <!--v-if-->
       <div class="flex gap-x-2 gap-y-1 group-[.compact]:gap-y-0 has-[>_*:nth-of-type(2)]:flex-col-reverse md:flex-row!">
         <!--v-if-->
@@ -57,8 +57,8 @@ exports[`<ContainerEventSource /> > render html correctly > should render messag
         </div>
       </div>
       <div data-v-e625cddd="" class="mt-1.5 size-2.5 flex-none rounded-lg flex select-none"></div>
-      <div data-v-a49e52d4="" class="log-wrapper [word-break:break-word] whitespace-pre-wrap group-[.disable-wrap]:whitespace-nowrap">This is a message.</div>
-      <div data-v-a49e52d4="" class="flex gap-2 absolute -right-1 opacity-0 transition-opacity delay-150 duration-250 group-hover/entry:opacity-100">
+      <div class="[word-break:break-word] whitespace-pre-wrap group-[.disable-wrap]:whitespace-nowrap">This is a message.</div>
+      <div class="flex gap-2 absolute -right-1 opacity-0 transition-opacity delay-150 duration-250 group-hover/entry:opacity-100">
         <!--v-if-->
       </div>
     </div>
diff --git a/internal/support/search/search.go b/internal/support/search/search.go
deleted file mode 100644
index e8e8a42a..00000000
--- a/internal/support/search/search.go
+++ /dev/null
@@ -1,184 +0,0 @@
-package search
-
-import (
-	"fmt"
-	"regexp"
-	"strings"
-
-	"github.com/amir20/dozzle/internal/container"
-	"github.com/rs/zerolog/log"
-	orderedmap "github.com/wk8/go-ordered-map/v2"
-)
-
-const (
-	MarkerStart = "\uE000"
-	MarkerEnd   = "\uE001"
-)
-
-func ParseRegex(search string) (*regexp.Regexp, error) {
-	flags := ""
-
-	if search == strings.ToLower(search) {
-		flags = "(?i)"
-	}
-	re, err := regexp.Compile(flags + search)
-
-	if err != nil {
-		log.Debug().Err(err).Str("search", search).Msg("failed to compile regex")
-		return nil, err
-	}
-
-	return re, nil
-}
-
-func Search(re *regexp.Regexp, logEvent *container.LogEvent) bool {
-	switch value := logEvent.Message.(type) {
-	case string:
-		if re.MatchString(value) {
-			logEvent.Message = re.ReplaceAllString(value, MarkerStart+"$0"+MarkerEnd)
-			return true
-		}
-
-	case *orderedmap.OrderedMap[string, any]:
-		return searchMapAny(re, value)
-
-	case *orderedmap.OrderedMap[string, string]:
-		return searchMapString(re, value)
-
-	case map[string]interface{}:
-		panic("not implemented")
-	case map[string]string:
-		panic("not implemented")
-	default:
-		log.Debug().Type("type", value).Msg("unknown logEvent type")
-	}
-
-	return false
-}
-
-func searchMapAny(re *regexp.Regexp, orderedMap *orderedmap.OrderedMap[string, any]) bool {
-	found := false
-	for pair := orderedMap.Oldest(); pair != nil; pair = pair.Next() {
-		switch value := pair.Value.(type) {
-		case string:
-			if replaced, matched := searchString(re, value); matched {
-				found = true
-				orderedMap.Set(pair.Key, replaced)
-			}
-
-		case []any:
-			if searchArray(re, value) {
-				found = true
-			}
-
-		case *orderedmap.OrderedMap[string, any]:
-			if searchMapAny(re, value) {
-				found = true
-			}
-
-		case *orderedmap.OrderedMap[string, string]:
-			if searchMapString(re, value) {
-				found = true
-			}
-
-		case map[string]interface{}:
-			if searchMap(re, value) {
-				found = true
-			}
-
-		case int, float64, bool:
-			formatted := fmt.Sprintf("%v", value)
-			if re.MatchString(formatted) {
-				orderedMap.Set(pair.Key, re.ReplaceAllString(formatted, MarkerStart+"$0"+MarkerEnd))
-				found = true
-			}
-
-		default:
-			log.Debug().Type("type", value).Msg("unknown logEvent type inside searchMapAny")
-		}
-	}
-
-	return found
-}
-
-func searchMap(re *regexp.Regexp, data map[string]interface{}) bool {
-	found := false
-	for key, value := range data {
-		switch value := value.(type) {
-		case string:
-			if replaced, matched := searchString(re, value); matched {
-				found = true
-				data[key] = replaced
-			}
-		case []any:
-			if searchArray(re, value) {
-				found = true
-			}
-
-		case map[string]interface{}:
-			if searchMap(re, value) {
-				found = true
-			}
-
-		case int, float64, bool:
-			formatted := fmt.Sprintf("%v", value)
-			if re.MatchString(formatted) {
-				data[key] = re.ReplaceAllString(formatted, MarkerStart+"$0"+MarkerEnd)
-				found = true
-			}
-		default:
-			log.Debug().Type("type", value).Msg("unknown logEvent type inside searchMap")
-		}
-	}
-
-	return found
-}
-
-func searchMapString(re *regexp.Regexp, orderedMap *orderedmap.OrderedMap[string, string]) bool {
-	found := false
-	for pair := orderedMap.Oldest(); pair != nil; pair = pair.Next() {
-		if replaced, matched := searchString(re, pair.Value); matched {
-			found = true
-			orderedMap.Set(pair.Key, replaced)
-		}
-	}
-	return found
-}
-
-func searchArray(re *regexp.Regexp, data []any) bool {
-	found := false
-	for i, value := range data {
-		switch value := value.(type) {
-		case string:
-			if replaced, matched := searchString(re, value); matched {
-				found = true
-				data[i] = replaced
-			}
-		case int, float64, bool:
-			formatted := fmt.Sprintf("%v", value)
-			if re.MatchString(formatted) {
-				data[i] = re.ReplaceAllString(formatted, MarkerStart+"$0"+MarkerEnd)
-				found = true
-			}
-		case []any:
-			if searchArray(re, value) {
-				found = true
-			}
-		case map[string]interface{}:
-			if searchMap(re, value) {
-				found = true
-			}
-		}
-	}
-
-	return found
-}
-
-func searchString(re *regexp.Regexp, value string) (string, bool) {
-	if re.MatchString(value) {
-		replaced := re.ReplaceAllString(value, MarkerStart+"$0"+MarkerEnd)
-		return replaced, true
-	}
-
-	return value, false
-}
diff --git a/internal/support/web/escape.go b/internal/support/web/escape.go
index 8c843b77..f37daf5b 100644
--- a/internal/support/web/escape.go
+++ b/internal/support/web/escape.go
@@ -2,20 +2,25 @@ package support_web
 
 import (
 	"html"
+	"regexp"
 	"strings"
 
 	"github.com/amir20/dozzle/internal/container"
-	"github.com/amir20/dozzle/internal/support/search"
+
 	"github.com/rs/zerolog/log"
 	orderedmap "github.com/wk8/go-ordered-map/v2"
 )
 
+// URL marker regex compiled once for performance
+var urlMarkerRegex = regexp.MustCompile(URLMarkerStart + "(.*?)" + URLMarkerEnd)
+
 func EscapeHTMLValues(logEvent *container.LogEvent) {
+	// Mark URLs before HTML escaping
+	MarkURLs(logEvent)
+
 	switch value := logEvent.Message.(type) {
 	case string:
-		value = html.EscapeString(value)
-		value = strings.ReplaceAll(value, search.MarkerStart, "<mark>")
-		logEvent.Message = strings.ReplaceAll(value, search.MarkerEnd, "</mark>")
+		logEvent.Message = escapeAndProcessMarkers(value)
 
 	case *orderedmap.OrderedMap[string, any]:
 		escapeAnyMap(value)
@@ -34,28 +39,53 @@ func EscapeHTMLValues(logEvent *container.LogEvent) {
 	}
 }
 
+func escapeAndProcessMarkers(value string) string {
+	value = html.EscapeString(value)
+	value = strings.ReplaceAll(value, MarkerStart, "<mark>")
+	value = strings.ReplaceAll(value, MarkerEnd, "</mark>")
+	// Process URL markers
+	value = urlMarkerRegex.ReplaceAllString(value, "<a href=\"$1\" target=\"_blank\" rel=\"noopener noreferrer external\">$1</a>")
+	return value
+}
+
 func escapeAnyMap(orderedMap *orderedmap.OrderedMap[string, any]) {
 	for pair := orderedMap.Oldest(); pair != nil; pair = pair.Next() {
 		switch value := pair.Value.(type) {
 		case string:
-			value = html.EscapeString(value)
-			value = strings.ReplaceAll(value, search.MarkerStart, "<mark>")
-			value = strings.ReplaceAll(value, search.MarkerEnd, "</mark>")
-			orderedMap.Set(pair.Key, value)
+			orderedMap.Set(pair.Key, escapeAndProcessMarkers(value))
 		case *orderedmap.OrderedMap[string, any]:
 			escapeAnyMap(value)
 		case *orderedmap.OrderedMap[string, string]:
 			escapeStringMap(value)
+		case map[string]interface{}:
+			escapeMapStringInterface(value)
+		case map[string]string:
+			escapeStringMapString(value)
 		}
 	}
-
 }
 
 func escapeStringMap(orderedMap *orderedmap.OrderedMap[string, string]) {
 	for pair := orderedMap.Oldest(); pair != nil; pair = pair.Next() {
-		value := html.EscapeString(pair.Value)
-		value = strings.ReplaceAll(value, search.MarkerStart, "<mark>")
-		value = strings.ReplaceAll(value, search.MarkerEnd, "</mark>")
-		orderedMap.Set(pair.Key, value)
+		orderedMap.Set(pair.Key, escapeAndProcessMarkers(pair.Value))
+	}
+}
+
+func escapeMapStringInterface(value map[string]interface{}) {
+	for key, val := range value {
+		switch val := val.(type) {
+		case string:
+			value[key] = escapeAndProcessMarkers(val)
+		case map[string]interface{}:
+			escapeMapStringInterface(val)
+		case map[string]string:
+			escapeStringMapString(val)
+		}
+	}
+}
+
+func escapeStringMapString(value map[string]string) {
+	for key, val := range value {
+		value[key] = escapeAndProcessMarkers(val)
 	}
 }
diff --git a/internal/support/web/regex.go b/internal/support/web/regex.go
new file mode 100644
index 00000000..9f795292
--- /dev/null
+++ b/internal/support/web/regex.go
@@ -0,0 +1,198 @@
+package support_web
+
+import (
+	"fmt"
+	"regexp"
+	"strings"
+
+	"github.com/amir20/dozzle/internal/container"
+	"github.com/rs/zerolog/log"
+	orderedmap "github.com/wk8/go-ordered-map/v2"
+)
+
+// PatternMatcher defines the interface for a regex pattern matcher
+type PatternMatcher struct {
+	Regex       *regexp.Regexp
+	MarkerStart string
+	MarkerEnd   string
+}
+
+// NewPatternMatcher creates a new pattern matcher with the specified regex and markers
+func NewPatternMatcher(re *regexp.Regexp, markerStart, markerEnd string) *PatternMatcher {
+	return &PatternMatcher{
+		Regex:       re,
+		MarkerStart: markerStart,
+		MarkerEnd:   markerEnd,
+	}
+}
+
+// CreateRegex compiles a regex pattern with optional case-insensitive flag
+func CreateRegex(pattern string, caseInsensitive bool) (*regexp.Regexp, error) {
+	flags := ""
+	if caseInsensitive || pattern == strings.ToLower(pattern) {
+		flags = "(?i)"
+	}
+
+	re, err := regexp.Compile(flags + pattern)
+	if err != nil {
+		log.Debug().Err(err).Str("pattern", pattern).Msg("failed to compile regex")
+		return nil, err
+	}
+
+	return re, nil
+}
+
+// MarkInLogEvent applies the pattern matcher to the log event's message
+func (pm *PatternMatcher) MarkInLogEvent(logEvent *container.LogEvent) bool {
+	switch value := logEvent.Message.(type) {
+	case string:
+		if pm.Regex.MatchString(value) {
+			logEvent.Message = pm.Regex.ReplaceAllString(value, pm.MarkerStart+"$0"+pm.MarkerEnd)
+			return true
+		}
+
+	case *orderedmap.OrderedMap[string, any]:
+		return pm.markMapAny(value)
+
+	case *orderedmap.OrderedMap[string, string]:
+		return pm.markMapString(value)
+
+	case map[string]interface{}:
+		return pm.markMap(value)
+
+	case map[string]string:
+		panic("not implemented")
+
+	default:
+		log.Debug().Type("type", value).Msg("unknown logEvent type")
+	}
+
+	return false
+}
+
+func (pm *PatternMatcher) markMapAny(orderedMap *orderedmap.OrderedMap[string, any]) bool {
+	found := false
+	for pair := orderedMap.Oldest(); pair != nil; pair = pair.Next() {
+		switch value := pair.Value.(type) {
+		case string:
+			if replaced, matched := pm.markString(value); matched {
+				found = true
+				orderedMap.Set(pair.Key, replaced)
+			}
+
+		case []any:
+			if pm.markArray(value) {
+				found = true
+			}
+
+		case *orderedmap.OrderedMap[string, any]:
+			if pm.markMapAny(value) {
+				found = true
+			}
+
+		case *orderedmap.OrderedMap[string, string]:
+			if pm.markMapString(value) {
+				found = true
+			}
+
+		case map[string]interface{}:
+			if pm.markMap(value) {
+				found = true
+			}
+
+		case int, float64, bool:
+			formatted := fmt.Sprintf("%v", value)
+			if pm.Regex.MatchString(formatted) {
+				orderedMap.Set(pair.Key, pm.Regex.ReplaceAllString(formatted, pm.MarkerStart+"$0"+pm.MarkerEnd))
+				found = true
+			}
+
+		default:
+			log.Debug().Type("type", value).Msg("unknown logEvent type inside markMapAny")
+		}
+	}
+
+	return found
+}
+
+func (pm *PatternMatcher) markMap(data map[string]interface{}) bool {
+	found := false
+	for key, value := range data {
+		switch value := value.(type) {
+		case string:
+			if replaced, matched := pm.markString(value); matched {
+				found = true
+				data[key] = replaced
+			}
+		case []any:
+			if pm.markArray(value) {
+				found = true
+			}
+
+		case map[string]interface{}:
+			if pm.markMap(value) {
+				found = true
+			}
+
+		case int, float64, bool:
+			formatted := fmt.Sprintf("%v", value)
+			if pm.Regex.MatchString(formatted) {
+				data[key] = pm.Regex.ReplaceAllString(formatted, pm.MarkerStart+"$0"+pm.MarkerEnd)
+				found = true
+			}
+		default:
+			log.Debug().Type("type", value).Msg("unknown logEvent type inside markMap")
+		}
+	}
+
+	return found
+}
+
+func (pm *PatternMatcher) markMapString(orderedMap *orderedmap.OrderedMap[string, string]) bool {
+	found := false
+	for pair := orderedMap.Oldest(); pair != nil; pair = pair.Next() {
+		if replaced, matched := pm.markString(pair.Value); matched {
+			found = true
+			orderedMap.Set(pair.Key, replaced)
+		}
+	}
+	return found
+}
+
+func (pm *PatternMatcher) markArray(data []any) bool {
+	found := false
+	for i, value := range data {
+		switch value := value.(type) {
+		case string:
+			if replaced, matched := pm.markString(value); matched {
+				found = true
+				data[i] = replaced
+			}
+		case int, float64, bool:
+			formatted := fmt.Sprintf("%v", value)
+			if pm.Regex.MatchString(formatted) {
+				data[i] = pm.Regex.ReplaceAllString(formatted, pm.MarkerStart+"$0"+pm.MarkerEnd)
+				found = true
+			}
+		case []any:
+			if pm.markArray(value) {
+				found = true
+			}
+		case map[string]interface{}:
+			if pm.markMap(value) {
+				found = true
+			}
+		}
+	}
+
+	return found
+}
+
+func (pm *PatternMatcher) markString(value string) (string, bool) {
+	if pm.Regex.MatchString(value) {
+		replaced := pm.Regex.ReplaceAllString(value, pm.MarkerStart+"$0"+pm.MarkerEnd)
+		return replaced, true
+	}
+
+	return value, false
+}
diff --git a/internal/support/web/search.go b/internal/support/web/search.go
new file mode 100644
index 00000000..068d9712
--- /dev/null
+++ b/internal/support/web/search.go
@@ -0,0 +1,22 @@
+package support_web
+
+import (
+	"regexp"
+	"strings"
+
+	"github.com/amir20/dozzle/internal/container"
+)
+
+const (
+	MarkerStart = "\uE000"
+	MarkerEnd   = "\uE001"
+)
+
+func ParseRegex(search string) (*regexp.Regexp, error) {
+	return CreateRegex(search, search == strings.ToLower(search))
+}
+
+func Search(re *regexp.Regexp, logEvent *container.LogEvent) bool {
+	matcher := NewPatternMatcher(re, MarkerStart, MarkerEnd)
+	return matcher.MarkInLogEvent(logEvent)
+}
diff --git a/internal/support/web/url.go b/internal/support/web/url.go
new file mode 100644
index 00000000..2c168bbd
--- /dev/null
+++ b/internal/support/web/url.go
@@ -0,0 +1,21 @@
+package support_web
+
+import (
+	"regexp"
+
+	"github.com/amir20/dozzle/internal/container"
+)
+
+const (
+	URLMarkerStart = "\uE002"
+	URLMarkerEnd   = "\uE003"
+)
+
+// Standard URL regex pattern to match http/https URLs
+var urlRegex = regexp.MustCompile(`(https?:\/\/[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b(?:[-a-zA-Z0-9()@:%_\+.~#?&//=]*))`)
+
+// MarkURLs marks URLs in the logEvent message with special markers
+func MarkURLs(logEvent *container.LogEvent) bool {
+	matcher := NewPatternMatcher(urlRegex, URLMarkerStart, URLMarkerEnd)
+	return matcher.MarkInLogEvent(logEvent)
+}
diff --git a/internal/web/logs.go b/internal/web/logs.go
index d8956379..c59b609d 100644
--- a/internal/web/logs.go
+++ b/internal/web/logs.go
@@ -20,7 +20,6 @@ import (
 	"github.com/amir20/dozzle/internal/auth"
 	"github.com/amir20/dozzle/internal/container"
 	container_support "github.com/amir20/dozzle/internal/support/container"
-	"github.com/amir20/dozzle/internal/support/search"
 	support_web "github.com/amir20/dozzle/internal/support/web"
 	"github.com/amir20/dozzle/internal/utils"
 	"github.com/dustin/go-humanize"
@@ -68,7 +67,7 @@ func (h *handler) fetchLogsBetweenDates(w http.ResponseWriter, r *http.Request)
 
 	var regex *regexp.Regexp
 	if r.URL.Query().Has("filter") {
-		regex, err = search.ParseRegex(r.URL.Query().Get("filter"))
+		regex, err = support_web.ParseRegex(r.URL.Query().Get("filter"))
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusBadRequest)
 			return
@@ -144,7 +143,7 @@ func (h *handler) fetchLogsBetweenDates(w http.ResponseWriter, r *http.Request)
 				}
 			} else {
 				if regex != nil {
-					if !search.Search(regex, event) {
+					if !support_web.Search(regex, event) {
 						continue
 					}
 				}
@@ -158,7 +157,7 @@ func (h *handler) fetchLogsBetweenDates(w http.ResponseWriter, r *http.Request)
 					break
 				}
 
-				support_web.EscapeHTMLValues(event) // only escape when not exporting
+				support_web.EscapeHTMLValues(event)
 				buffer.Push(event)
 			}
 		}
@@ -280,7 +279,7 @@ func (h *handler) streamLogsForContainers(w http.ResponseWriter, r *http.Request
 
 	if r.URL.Query().Has("filter") {
 		var err error
-		regex, err = search.ParseRegex(r.URL.Query().Get("filter"))
+		regex, err = support_web.ParseRegex(r.URL.Query().Get("filter"))
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusBadRequest)
 			return
@@ -317,7 +316,7 @@ func (h *handler) streamLogsForContainers(w http.ResponseWriter, r *http.Request
 						if _, ok := levels[log.Level]; !ok {
 							continue
 						}
-						if search.Search(regex, log) {
+						if support_web.Search(regex, log) {
 							events = append(events, log)
 						}
 					}
@@ -384,7 +383,7 @@ loop:
 		select {
 		case logEvent := <-liveLogs:
 			if regex != nil {
-				if !search.Search(regex, logEvent) {
+				if !support_web.Search(regex, logEvent) {
 					continue
 				}
 			}