diff --git a/src/screens/var-dump/ui/var-dump-page/var-dump-page.vue b/src/screens/var-dump/ui/var-dump-page/var-dump-page.vue
index 4d538c6d..b6fd57f6 100644
--- a/src/screens/var-dump/ui/var-dump-page/var-dump-page.vue
+++ b/src/screens/var-dump/ui/var-dump-page/var-dump-page.vue
@@ -41,7 +41,7 @@ const date = computed(() =>
         />
       </section>
 
-      <section class="var-dump__body">
+      <section v-if="event.payload.context.source" class="var-dump__body">
         <h3 class="var-dump__body-text">Source</h3>
         <TableBase class="var-dump__body-table">
           <TableBaseRow
@@ -54,7 +54,7 @@ const date = computed(() =>
         </TableBase>
       </section>
 
-      <section class="var-dump__body">
+      <section v-if="event.payload.context.request" class="var-dump__body">
         <h3 class="var-dump__body-text">Request</h3>
         <TableBase class="var-dump__body-table">
           <template
diff --git a/src/shared/ui/preview-card/preview-card-footer.vue b/src/shared/ui/preview-card/preview-card-footer.vue
index 2579a17f..37d46724 100644
--- a/src/shared/ui/preview-card/preview-card-footer.vue
+++ b/src/shared/ui/preview-card/preview-card-footer.vue
@@ -3,7 +3,7 @@ import { withDefaults, defineProps, computed } from "vue";
 import { IconSvg } from "../icon-svg";
 
 // TODO: Move this to a shared file
-const KEY_MAP = {
+const KEY_MAP: { [key: string]: string } = {
   php_version: "php",
   laravel_version: "laravel",
   symfony_version: "symfony",
@@ -25,16 +25,25 @@ const props = withDefaults(defineProps<Props>(), {
 });
 
 const mappedOrigins = computed(() =>
-  props.originConfig
-    ? Object.entries(props.originConfig).reduce((acc, [key, value]) => {
-        // Filter out empty values
-        if (!value || value === "undefined") return acc;
-
-        const mappedKey = KEY_MAP[key] || key;
-        acc[mappedKey] = value;
-        return acc;
-      }, {} as { [key: string]: string })
-    : {}
+  Object.entries(props.originConfig || {}).reduce((acc, [key, value]) => {
+    const fileName = props.originConfig?.file || "";
+
+    if (
+      key === "name" &&
+      fileName.includes(value, fileName.length - value.length)
+    ) {
+      return acc;
+    }
+
+    if (!value || value === "undefined") {
+      return acc;
+    }
+
+    const mappedKey = KEY_MAP[key] || key;
+    acc[mappedKey] = value;
+
+    return acc;
+  }, {} as { [key: string]: string })
 );
 </script>