diff --git a/js/control/Export.js b/js/control/Export.js
index c1ccde5..f0de8e6 100644
--- a/js/control/Export.js
+++ b/js/control/Export.js
@@ -66,13 +66,13 @@ BR.Export = L.Class.extend({
                             trackname.value = null;
                         } else if (from === to) {
                             trackname.value = i18next.t('export.route-loop', {
-                                from,
-                                distance
+                                from: from,
+                                distance: distance
                             });
                         } else {
                             trackname.value = i18next.t(
                                 'export.route-from-to',
-                                { from, to, distance }
+                                { from: from, to: to, distance: distance }
                             );
                         }
                     }, this)
diff --git a/js/router/BRouter.js b/js/router/BRouter.js
index ea9eab2..834c5c2 100644
--- a/js/router/BRouter.js
+++ b/js/router/BRouter.js
@@ -132,7 +132,11 @@ L.BRouter = L.Class.extend({
         if (urlParams.format != null)
             args.push(L.Util.template('format={format}', urlParams));
         if (trackname)
-            args.push(L.Util.template('trackname={trackname}', { trackname }));
+            args.push(
+                L.Util.template('trackname={trackname}', {
+                    trackname: trackname
+                })
+            );
 
         var prepend_host = format != null;