diff --git a/index.html b/index.html
index c7387fa..66e707b 100644
--- a/index.html
+++ b/index.html
@@ -680,26 +680,30 @@
                                             </label>
                                         </div>
                                     </div>
+                                </div>
+                            </fieldset>
+                            <fieldset id="export-includes" class="form-group">
+                                <div class="row">
                                     <legend
                                         class="col-form-label col-sm-2"
-                                        data-i18n="export.exportWaypoints"
+                                        data-i18n="export.include"
                                     >
-                                        <label
-                                            class="form-check-label"
-                                            for="export-waypoints"
-                                        >
-                                            Include waypoints
-                                        </label>
+                                        Include
                                     </legend>
                                     <div class="col-sm-10">
                                         <div class="form-check">
-                                            <input
-                                                class="form-check-input"
-                                                id="export-waypoints"
-                                                type="checkbox"
-                                                name="export-waypoints"
-                                                value="1"
-                                            />
+                                            <label class="form-check-label">
+                                                <input
+                                                    class="form-check-input"
+                                                    id="include-waypoints"
+                                                    type="checkbox"
+                                                    name="include-waypoints"
+                                                />
+                                                <span
+                                                    data-i18n="export.include_waypoints"
+                                                    >Waypoints</span
+                                                >
+                                            </label>
                                         </div>
                                     </div>
                                 </div>
diff --git a/js/control/Export.js b/js/control/Export.js
index 68c2b1d..5e9e9f1 100644
--- a/js/control/Export.js
+++ b/js/control/Export.js
@@ -45,13 +45,13 @@ BR.Export = L.Class.extend({
             exportForm['format'].value ||
             $('#export-format input:radio:checked').val();
         var name = encodeURIComponent(exportForm['trackname'].value);
-        var exportWaypoints = exportForm['export-waypoints'].checked;
+        var includeWaypoints = exportForm['include-waypoints'].checked;
 
         var uri = this.router.getUrl(
             this.latLngs,
             format,
             name,
-            exportWaypoints
+            includeWaypoints
         );
 
         var evt = document.createEvent('MouseEvents');
diff --git a/js/router/BRouter.js b/js/router/BRouter.js
index ddddc51..c3cfb2c 100644
--- a/js/router/BRouter.js
+++ b/js/router/BRouter.js
@@ -137,12 +137,7 @@ L.BRouter = L.Class.extend({
                     trackname: trackname
                 })
             );
-        if (exportWaypoints)
-            args.push(
-                L.Util.template('exportWaypoints={exportWaypoints}', {
-                    exportWaypoints: +exportWaypoints
-                })
-            );
+        if (exportWaypoints) args.push('exportWaypoints=1');
 
         var prepend_host = format != null;