diff --git a/src/store/modules/event.ts b/src/store/modules/event.ts
index d396e7d5..fed1fa74 100644
--- a/src/store/modules/event.ts
+++ b/src/store/modules/event.ts
@@ -19,7 +19,7 @@ import { store } from "@/store";
 import graphql from "@/graphql";
 import { AxiosResponse } from "axios";
 import { Event, QueryEventCondition } from "@/types/events";
-import { Instance, Endpoint, Service } from "@/types/selector";
+import { Instance, Endpoint } from "@/types/selector";
 import { useAppStoreWithOut } from "@/store/modules/app";
 import { useSelectorStore } from "@/store/modules/selectors";
 
diff --git a/src/styles/reset.scss b/src/styles/reset.scss
index 1cd516a9..e6b3f8fd 100644
--- a/src/styles/reset.scss
+++ b/src/styles/reset.scss
@@ -159,10 +159,7 @@ div.vis-tooltip {
   max-width: 600px;
   overflow: hidden;
   background-color: #fff !important;
-
-  .message {
-    word-wrap: break-word !important;
-  }
+  white-space: normal !important;
 }
 
 .vis-item {
diff --git a/src/views/dashboard/related/event/Content.vue b/src/views/dashboard/related/event/Content.vue
index 50e3f180..9fb085cd 100644
--- a/src/views/dashboard/related/event/Content.vue
+++ b/src/views/dashboard/related/event/Content.vue
@@ -55,21 +55,15 @@ function visTimeline() {
     tooltip: {
       template(item) {
         const data = item.data || {};
-        return `<div><span>Event ID: </span>${data.uuid || ""}</div>
-         <div><span>Event Name: </span>${data.name || ""}</div>
-        <div class="mb-5"><span>Event Type: </span>${data.type || ""}</div>
-         <div class="mb-5"><span>Start Time: </span>${
-           data.startTime ? visDate(data.startTime) : ""
-         }</div>
-          <div class="mb-5"><span>End Time: </span>${
-            data.endTime ? visDate(data.endTime) : ""
-          }</div>
-        <div class="message">Event Message: ${data.message || ""}</div>
-         <div>Service: ${data.source.service || ""}</div>
-          <div>Endpoint: ${data.source.endpoint || ""}
-          </div>
-          <div>Service Instance: ${data.source.instance || ""}
-          </div></div>`;
+        return `<div>ID: ${data.uuid || ""}</div>
+        <div>Name: ${data.name || ""}</div>
+        <div>Event Type: ${data.type || ""}</div>
+        <div>Start Time: ${data.startTime ? visDate(data.startTime) : ""}</div>
+        <div>End Time: ${data.endTime ? visDate(data.endTime) : ""}</div>
+        <div>Message: ${data.message || ""}</div>
+        <div>Service: ${data.source.service || ""}</div>
+        <div>Endpoint: ${data.source.endpoint || ""}</div>
+        <div>Service Instance: ${data.source.instance || ""}</div>`;
       },
     },
   };
diff --git a/src/views/dashboard/related/event/Header.vue b/src/views/dashboard/related/event/Header.vue
index 75ac1ee7..f0aad3dc 100644
--- a/src/views/dashboard/related/event/Header.vue
+++ b/src/views/dashboard/related/event/Header.vue
@@ -181,6 +181,15 @@ function updatePage(p: number) {
   queryEvents();
 }
 
+watch(
+  () => [selectorStore.currentService],
+  () => {
+    if (dashboardStore.entity === EntityType[0].value) {
+      init();
+    }
+  }
+);
+
 watch(
   () => [selectorStore.currentPod],
   () => {