diff --git a/brouter-server/src/main/java/btools/server/request/ServerHandler.java b/brouter-server/src/main/java/btools/server/request/ServerHandler.java
index 1364ac0..5d76af4 100644
--- a/brouter-server/src/main/java/btools/server/request/ServerHandler.java
+++ b/brouter-server/src/main/java/btools/server/request/ServerHandler.java
@@ -113,7 +113,7 @@ public class ServerHandler extends RequestHandler {
     String result;
     // optional, may be null
     String format = params.get( "format" );
-    String trackName = params.get( "trackname" );
+    String trackName = getTrackName();
     if (trackName != null) {
       track.name = trackName;
     }
@@ -188,15 +188,21 @@ public class ServerHandler extends RequestHandler {
   {
     String fileName = null;
     String format = params.get( "format" );
+    String trackName = getTrackName();
 
     if ( format != null )
     {
-      fileName = ( params.get( "trackname" ) == null ? "brouter" : params.get( "trackname" ).replaceAll("[^a-zA-Z0-9 \\._\\-]+", "") ) + "." + format;
+      fileName = ( trackName == null ? "brouter" : trackName ) + "." + format;
     }
 
     return fileName;
   }
 
+  private String getTrackName()
+  {
+    return params.get( "trackname" ) == null ? null : params.get( "trackname" ).replaceAll("[^a-zA-Z0-9 \\._\\-]+", "");
+  }
+
   private static OsmNodeNamed readPosition( String vlon, String vlat, String name )
   {
     if ( vlon == null ) throw new IllegalArgumentException( "lon " + name + " not found in input" );