diff --git a/src/components/Dashboard.jsx b/src/components/Dashboard.jsx
index 1c6d4bf..cd6d22b 100644
--- a/src/components/Dashboard.jsx
+++ b/src/components/Dashboard.jsx
@@ -22,6 +22,8 @@ class Dashboard extends React.Component {
     this.handleToggle = this.handleToggle.bind(this);
     this.handleTagFilter = this.handleTagFilter.bind(this);
     this.handleTimeFilter = this.handleTimeFilter.bind(this);
+
+    this.eventsById = {};
   }
 
   componentDidMount() {
@@ -35,9 +37,15 @@ class Dashboard extends React.Component {
     this.props.actions.updateHighlighted((highlighted) ? highlighted : null);
   }
 
+  getEventById(eventId) {
+    if (this.eventsById[eventId]) return this.eventsById[eventId];
+    this.eventsById[eventId] = this.props.domain.events.find(ev => ev.id === eventId);
+    return this.eventsById[eventId];
+  }
+
   handleSelect(selected) {
     if (selected) {
-      let eventsToSelect = selected.map(eventId => this.props.domain.events[eventId]);
+      let eventsToSelect = selected.map(eventId => this.getEventById(eventId));
       const parser = this.props.ui.tools.parser;
 
       eventsToSelect = eventsToSelect.sort((a, b) => {
@@ -53,7 +61,7 @@ class Dashboard extends React.Component {
       this.props.actions.fetchEvents(selected)
         .then((events) => {
           let eventsSelected = events.map(ev => {
-            return Object.assign({}, ev, this.props.domain.events[ev.id]);
+            return Object.assign({}, ev, this.getEventById(ev.id));
           });
 
           eventsSelected = eventsSelected.sort((a, b) => {
diff --git a/src/components/Notification.jsx b/src/components/Notification.jsx
index 824264a..18112b1 100644
--- a/src/components/Notification.jsx
+++ b/src/components/Notification.jsx
@@ -31,14 +31,14 @@ export default class Notification extends React.Component{
     const { type, message, items } = notification;
 
     return (
-      <React.Fragment>
+      <div>
         <div className={`message ${type}`}>
           {`${message}`}
         </div>
         <div className={`details ${this.state.isExtended}`}>
           {(items !== null) ? this.renderItems(items) : ''}
         </div>
-      </React.Fragment>
+      </div>
     )
   }