diff --git a/src/components/SearchTracePage/TraceSearchForm.js b/src/components/SearchTracePage/TraceSearchForm.js
index ada0fa5add..3719c98070 100644
--- a/src/components/SearchTracePage/TraceSearchForm.js
+++ b/src/components/SearchTracePage/TraceSearchForm.js
@@ -68,14 +68,14 @@ export function convertQueryParamsToFormDates({ start, end }) {
   let queryEndDate;
   let queryEndDateTime;
   if (end) {
-    const endUnix = moment(parseInt(end.replace('000', ''), 10));
-    queryEndDate = formatDate(endUnix * 1000);
-    queryEndDateTime = formatTime(endUnix * 1000);
+    const endUnixNs = parseInt(end, 10);
+    queryEndDate = formatDate(endUnixNs);
+    queryEndDateTime = formatTime(endUnixNs);
   }
   if (start) {
-    const startUnix = moment(parseInt(start.replace('000', ''), 10));
-    queryStartDate = formatDate(startUnix * 1000);
-    queryStartDateTime = formatTime(startUnix * 1000);
+    const startUnixNs = parseInt(start, 10);
+    queryStartDate = formatDate(startUnixNs);
+    queryStartDateTime = formatTime(startUnixNs);
   }
 
   return {
diff --git a/src/components/TracePage/TracePageHeader.js b/src/components/TracePage/TracePageHeader.js
index 089cf3ede6..b0302e6b08 100644
--- a/src/components/TracePage/TracePageHeader.js
+++ b/src/components/TracePage/TracePageHeader.js
@@ -20,6 +20,7 @@ import { Dropdown, Menu } from 'semantic-ui-react';
 import KeyboardShortcutsHelp from './KeyboardShortcutsHelp';
 import { FALLBACK_TRACE_NAME } from '../../constants';
 import { formatDatetime, formatDuration } from '../../utils/date';
+import prefixUrl from '../../utils/prefix-url';
 
 type TracePageHeaderProps = {
   traceID: string,
@@ -103,8 +104,17 @@ export default function TracePageHeader(props: TracePageHeaderProps) {
             <Dropdown text="View Options" className="item">
               <Dropdown.Menu>
                 <Dropdown.Item>
-                  <a rel="noopener noreferrer" target="_blank" href={`/api/traces/${traceID}`}>
-                    View Trace JSON
+                  <a rel="noopener noreferrer" target="_blank" href={prefixUrl(`/api/traces/${traceID}`)}>
+                    Trace JSON
+                  </a>
+                </Dropdown.Item>
+                <Dropdown.Item>
+                  <a
+                    rel="noopener noreferrer"
+                    target="_blank"
+                    href={prefixUrl(`/api/traces/${traceID}?raw=true`)}
+                  >
+                    Trace JSON (unadjusted)
                   </a>
                 </Dropdown.Item>
               </Dropdown.Menu>