diff --git a/gulpfile.js b/gulpfile.js
index 11f844b..3888315 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -286,6 +286,7 @@ gulp.task('bump:html', function () {
     return gulp
         .src('./index.html')
         .pipe(replace(/<sup class="version">(.*)<\/sup>/, '<sup class="version">' + pkg.version + '</sup>'))
+        .pipe(replace(/BR.version = '(.*?)';/, "BR.version = '" + pkg.version + "';"))
         .pipe(gulp.dest('.'));
 });
 
diff --git a/index.html b/index.html
index 278cacb..6195761 100644
--- a/index.html
+++ b/index.html
@@ -1143,6 +1143,7 @@
         <script>
             // global package prefix for BRouter web application
             BR = {};
+            BR.version = '0.15.1';
 
             console.log(
                 '\r\n###\r\n###  BRouter-Web\r\n###\r\n###  Please note that the routing API used here is not public!\r\n###\r\n'
diff --git a/js/control/Export.js b/js/control/Export.js
index 55fac1a..8603813 100644
--- a/js/control/Export.js
+++ b/js/control/Export.js
@@ -46,13 +46,14 @@ BR.Export = L.Class.extend({
     _export: function (e) {
         var exportForm = document.forms['export'];
         var format = exportForm['format'].value || $('#export-format input:radio:checked').val();
-        var name = encodeURIComponent(exportForm['trackname'].value);
+        var name = exportForm['trackname'].value;
+        var nameUri = encodeURIComponent(name);
         var includeWaypoints = exportForm['include-waypoints'].checked;
 
         e.preventDefault();
 
         if (true) {
-            var uri = this.router.getUrl(this.latLngs, this.pois.getMarkers(), null, format, name, includeWaypoints);
+            var uri = this.router.getUrl(this.latLngs, this.pois.getMarkers(), null, format, nameUri, includeWaypoints);
 
             // var evt = document.createEvent('MouseEvents');
             // evt.initMouseEvent('click', true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
@@ -69,6 +70,9 @@ BR.Export = L.Class.extend({
 
     _formatTrack: function (format, name, includeWaypoints) {
         const track = BR.Export._concatTotalTrack(this.segments);
+        if (name) {
+            track.features[0].properties.name = name;
+        }
         this._addPois(track);
         if (includeWaypoints) {
             this._addRouteWaypoints(track);
diff --git a/js/format/Gpx.js b/js/format/Gpx.js
index 8c6c295..79326af 100644
--- a/js/format/Gpx.js
+++ b/js/format/Gpx.js
@@ -49,6 +49,7 @@ BR.Gpx = {
         const gpxTransform = new GpxTransform(voiceHintsTransform);
 
         let gpx = togpx(geoJson, {
+            creator: 'BRouter-Web ' + BR.version,
             featureTitle: function () {},
             featureDescription: function () {},
             featureCoordTimes: function () {},
diff --git a/js/util/Diff.js b/js/util/Diff.js
index 26f3407..5cf16b6 100644
--- a/js/util/Diff.js
+++ b/js/util/Diff.js
@@ -95,7 +95,7 @@ BR.Diff.diffPrettyHtml = function (diffs, contextLen = 2) {
 // TODO remove
 // copied from Gpx.test.js
 BR.Diff.adoptGpx = function (gpx, replaceCreator = true) {
-    const creator = 'togpx';
+    const creator = 'BRouter-Web 0.15.1';
     const name = 'Track';
     const newline = '\n';
 
diff --git a/tests/format/Gpx.test.js b/tests/format/Gpx.test.js
index 574bf05..7798e44 100644
--- a/tests/format/Gpx.test.js
+++ b/tests/format/Gpx.test.js
@@ -1,4 +1,5 @@
 BR = {};
+BR.version = '1.5.1';
 turf = require('@turf/turf');
 togpx = require('togpx');
 require('leaflet');
@@ -15,7 +16,7 @@ const path = 'tests/format/data/';
 
 // resolve intended/accepted differences before comparing
 function adoptGpx(gpx, replaceCreator = true) {
-    const creator = 'togpx';
+    const creator = 'BRouter-Web 1.5.1';
     const name = 'Track';
     const newline = '\n';