diff --git a/src/components/EventEditor.vue b/src/components/EventEditor.vue
index 9007bfc9..cf4fb01a 100644
--- a/src/components/EventEditor.vue
+++ b/src/components/EventEditor.vue
@@ -34,6 +34,7 @@ b-modal(v-if="event && event.id", :id="'edit-modal-' + event.id", ref="eventEdit
           b-checkbox(v-if="typeof event.data[k] === typeof true", v-model="editedEvent.data[k]", style="margin: 0.25em")
           b-input(v-if="typeof event.data[k] === typeof 'string'", v-model="editedEvent.data[k]", size="sm")
           b-input(v-if="typeof event.data[k] === 'number'", v-model.number="editedEvent.data[k]", size="sm", type="number")
+          b-input(v-if="Array.isArray(event.data[k])", :value="event.data[k].join(', ')", size="sm", disabled)
 
     hr
 
diff --git a/src/util/tooltip.js b/src/util/tooltip.js
index 4cabd99e..5c6bd310 100644
--- a/src/util/tooltip.js
+++ b/src/util/tooltip.js
@@ -31,6 +31,25 @@ export function buildTooltip(bucket, e) {
       <tr><th>Title</th><td>${sanitize(e.data.title)}</td></tr>
       <tr><th>URL</th><td><a href=${sanitize(e.data.url)}>${sanitize(e.data.url)}</a></td></tr>
       `;
+    if (e.data.gmail_activity) {
+      inner += `<tr><th>Gmail Activity</th><td>${sanitize(e.data.gmail_activity)}</td></tr>`;
+      if (e.data.from)
+        inner += `<tr><th>From</th><td>${sanitize(e.data.from)}</td></tr>`;
+      if (e.data.subject)
+        inner += `<tr><th>Subject</th><td>${sanitize(e.data.subject)}</td></tr>`;
+      if (e.data.to && e.data.to.length > 0)
+        inner += `<tr><th>To</th><td>${sanitize(
+          Array.isArray(e.data.to) ? e.data.to.join(', ') : e.data.to
+        )}</td></tr>`;
+      if (e.data.cc && e.data.cc.length > 0)
+        inner += `<tr><th>CC</th><td>${sanitize(
+          Array.isArray(e.data.cc) ? e.data.cc.join(', ') : e.data.cc
+        )}</td></tr>`;
+      if (e.data.bcc && e.data.bcc.length > 0)
+        inner += `<tr><th>BCC</th><td>${sanitize(
+          Array.isArray(e.data.bcc) ? e.data.bcc.join(', ') : e.data.bcc
+        )}</td></tr>`;
+    }
   } else if (bucket.type.startsWith('app.editor')) {
     inner = `
       <tr><th>Filename</th><td>${sanitize(_.last(e.data.file.split('/')))}</td></tr>
diff --git a/src/visualizations/EventList.vue b/src/visualizations/EventList.vue
index e520fbf5..11b8b3a0 100644
--- a/src/visualizations/EventList.vue
+++ b/src/visualizations/EventList.vue
@@ -144,7 +144,7 @@ export default {
   },
   computed: {
     displayed_events: function () {
-      return this.events.slice(0, this.limit);
+      return (this.events || []).slice(0, this.limit);
     },
   },
   methods: {