diff --git a/src/Map/Map.jsx b/src/Map/Map.jsx
index e50accd..94fdf16 100644
--- a/src/Map/Map.jsx
+++ b/src/Map/Map.jsx
@@ -15,6 +15,7 @@ import PropTypes from 'prop-types'
 import axios from 'axios'
 
 import * as R from 'ramda'
+import { intervalToDuration } from 'date-fns'
 import ExtraMarkers from './extraMarkers'
 import { Button, Label, Icon, Popup } from 'semantic-ui-react'
 import { CopyToClipboard } from 'react-copy-to-clipboard'
@@ -526,11 +527,25 @@ class Map extends React.Component {
   }
 
   formatDuration = (durationInSeconds) => {
-    const date = new Date(durationInSeconds * 1000)
-    const days = date.getDate() - 1 > 0 ? date.getDate() - 1 + 'd ' : ''
-    const hours = date.getHours() > 0 ? date.getHours() + 'h ' : ''
-    const minutes = date.getMinutes() > 0 ? date.getMinutes() + 'min' : ''
-    return days + hours + minutes
+    const duration = intervalToDuration({
+      start: 0,
+      end: durationInSeconds * 1000,
+    })
+
+    let durationStr = ''
+    if (duration.days > 0) {
+      durationStr += duration.days + 'd '
+    }
+    if (duration.hours > 0) {
+      durationStr += duration.hours + 'h '
+    }
+    if (duration.minutes > 0) {
+      durationStr += duration.minutes + 'min '
+    }
+    if (duration.seconds > 0) {
+      durationStr += duration.seconds + 'sec'
+    }
+    return durationStr
   }
 
   getRouteToolTip = (summary, provider) => {
diff --git a/src/actions/commonActions.js b/src/actions/commonActions.js
index 94352f4..6ee3ee3 100644
--- a/src/actions/commonActions.js
+++ b/src/actions/commonActions.js
@@ -63,7 +63,7 @@ export const updatePermalink = () => (dispatch, getState) => {
   const queryParams = new URLSearchParams()
   queryParams.set('profile', profile)
 
-  let path = '/directions?'
+  let path = '#directions?'
   if (activeTab === 0) {
     const wps = []
     for (const wp of waypoints) {
@@ -77,7 +77,7 @@ export const updatePermalink = () => (dispatch, getState) => {
       queryParams.set('wps', wps.toString())
     }
   } else {
-    path = '/isochrones?'
+    path = '#isochrones?'
 
     let center
     for (const result of geocodeResults) {