diff --git a/frontend/app/components/Session_/Network/Network.js b/frontend/app/components/Session_/Network/Network.js
index b3ea3dafb..4c30e6f32 100644
--- a/frontend/app/components/Session_/Network/Network.js
+++ b/frontend/app/components/Session_/Network/Network.js
@@ -158,30 +158,30 @@ export default class Network extends React.PureComponent {
     let filtered = resources.filter(({ type, name }) =>
       filterRE.test(name) && (activeTab === ALL || type === TAB_TO_TYPE_MAP[ activeTab ]));
 
-    const referenceLines = [];
-    if (domContentLoadedTime != null) {
-      referenceLines.push({
-        time: domContentLoadedTime,
-        color: DOM_LOADED_TIME_COLOR,
-      })
-    }
-    if (loadTime != null) {
-      referenceLines.push({
-        time: loadTime,
-        color: LOAD_TIME_COLOR,
-      })
-    }
-
-    let tabs = TABS;
-    if (!fetchPresented) {
-      tabs = TABS.map(tab => tab.key === XHR 
-        ? {
-            text: renderXHRText(),
-            key: XHR,
-          } 
-        : tab
-      );
-    }
+//     const referenceLines = [];
+//     if (domContentLoadedTime != null) {
+//       referenceLines.push({
+//         time: domContentLoadedTime,
+//         color: DOM_LOADED_TIME_COLOR,
+//       })
+//     }
+//     if (loadTime != null) {
+//       referenceLines.push({
+//         time: loadTime,
+//         color: LOAD_TIME_COLOR,
+//       })
+//     }
+// 
+//     let tabs = TABS;
+//     if (!fetchPresented) {
+//       tabs = TABS.map(tab => tab.key === XHR 
+//         ? {
+//             text: renderXHRText(),
+//             key: XHR,
+//           } 
+//         : tab
+//       );
+//     }
 
     const resourcesSize = filtered.reduce((sum, { decodedBodySize }) => sum + (decodedBodySize || 0), 0);
     const transferredSize = filtered
diff --git a/frontend/app/components/Session_/Network/NetworkContent.js b/frontend/app/components/Session_/Network/NetworkContent.js
index 1f10eaffe..7eeebf538 100644
--- a/frontend/app/components/Session_/Network/NetworkContent.js
+++ b/frontend/app/components/Session_/Network/NetworkContent.js
@@ -168,13 +168,13 @@ export default class NetworkContent extends React.PureComponent {
     const referenceLines = [];
     if (domContentLoadedTime != null) {
       referenceLines.push({
-        time: domContentLoadedTime,
+        time: domContentLoadedTime.time,
         color: DOM_LOADED_TIME_COLOR,
       })
     }
     if (loadTime != null) {
       referenceLines.push({
-        time: loadTime,
+        time: loadTime.time,
         color: LOAD_TIME_COLOR,
       })
     }
@@ -239,13 +239,13 @@ export default class NetworkContent extends React.PureComponent {
               />
               <InfoLine.Point 
                 label="DOMContentLoaded"
-                value={ formatMs(domContentLoadedTime)}
+                value={ domContentLoadedTime && formatMs(domContentLoadedTime.value)}
                 display={ domContentLoadedTime != null }
                 dotColor={ DOM_LOADED_TIME_COLOR }
               />
               <InfoLine.Point 
                 label="Load"
-                value={ formatMs(loadTime)}
+                value={ loadTime && formatMs(loadTime.value)}
                 display={ loadTime != null }
                 dotColor={ LOAD_TIME_COLOR }
               />
diff --git a/frontend/app/player/MessageDistributor/MessageDistributor.js b/frontend/app/player/MessageDistributor/MessageDistributor.js
index fa3641b7a..50213f3ea 100644
--- a/frontend/app/player/MessageDistributor/MessageDistributor.js
+++ b/frontend/app/player/MessageDistributor/MessageDistributor.js
@@ -43,6 +43,14 @@ export const INITIAL_STATE = {
   skipIntervals: [],
 }
 
+function initLists() {
+  const lists = {};
+  for (var i = 0; i < LIST_NAMES.length; i++) {
+    lists[ LIST_NAMES[i] ] = new ListWalker();
+  }
+  return lists;
+}
+
 
 import type { 
   Message,
@@ -78,16 +86,7 @@ export default class MessageDistributor extends StatedScreen {
   #scrollManager: ListWalker<SetViewportScroll> = new ListWalker();
 
   #decoder = new Decoder();
-  #lists = {
-    redux: new ListWalker(),
-    mobx: new ListWalker(),
-    vuex: new ListWalker(),
-    ngrx: new ListWalker(),
-    graphql: new ListWalker(),
-    exceptions: new ListWalker(),
-    profiles: new ListWalker(),
-    longtasks: new ListWalker(),
-  }
+  #lists = initLists();
 
   #activirtManager: ActivityManager;
 
@@ -236,10 +235,16 @@ export default class MessageDistributor extends StatedScreen {
     const llEvent = this.#locationEventManager.moveToLast(t, index);
     if (!!llEvent) {
       if (llEvent.domContentLoadedTime != null) {
-        stateToUpdate.domContentLoadedTime = llEvent.domContentLoadedTime + this.#navigationStartOffset;
+        stateToUpdate.domContentLoadedTime = {
+          time: llEvent.domContentLoadedTime + this.#navigationStartOffset,
+          value: llEvent.domContentLoadedTime,
+        }
       }
       if (llEvent.loadTime != null) {
-        stateToUpdate.loadTime = llEvent.domContentLoadedTime + this.#navigationStartOffset
+        stateToUpdate.loadTime = {
+          time: llEvent.loadTime + this.#navigationStartOffset,
+          value: llEvent.loadTime,
+        }
       }
       if (llEvent.domBuildingTime != null) {
         stateToUpdate.domBuildingTime = llEvent.domBuildingTime;