diff --git a/WebContent/OSRM.Localization.js b/WebContent/OSRM.Localization.js
index 8d95896a8..1fa979c9c 100644
--- a/WebContent/OSRM.Localization.js
+++ b/WebContent/OSRM.Localization.js
@@ -59,7 +59,6 @@ OSRM.Localization["de"] = {
 // routing
 "ROUTE_DESCRIPTION": "Routenbeschreibung",
 "GET_LINK": "Generiere Link",
-"LINK_TO_ROUTE": "Link zur Route",
 "LINK_TO_ROUTE_TIMEOUT": "nicht möglich",
 "GPX_FILE": "GPX Datei",
 "DISTANCE": "Distanz",
@@ -101,7 +100,6 @@ OSRM.Localization["en"] = {
 //routing
 "ROUTE_DESCRIPTION": "Route Description",
 "GET_LINK": "Generate Link",
-"LINK_TO_ROUTE": "Route Link",
 "LINK_TO_ROUTE_TIMEOUT": "not available",
 "GPX_FILE": "GPX File",
 "DISTANCE": "Distance",
diff --git a/WebContent/OSRM.config.js b/WebContent/OSRM.config.js
index 1adee1129..e6ca44af3 100644
--- a/WebContent/OSRM.config.js
+++ b/WebContent/OSRM.config.js
@@ -21,7 +21,7 @@ or see http://www.gnu.org/licenses/agpl.txt.
 OSRM.DEFAULTS = {
 	HOST_ROUTING_URL: 'http://router.project-osrm.org/viaroute',
 	HOST_SHORTENER_URL: 'http://map.project-osrm.org/shorten/',
-	WEBSITE_URL: 'http://map.project-osrm.org/',
+	WEBSITE_URL: document.URL.replace(/#*\?.*/i,""),
 	JSONP_TIMEOUT: 2000,
 	ZOOM_LEVEL: 14,
 	ONLOAD_LATITUDE: 48.84,
diff --git a/WebContent/routing.js b/WebContent/routing.js
index cd430a8bd..ca382ac52 100644
--- a/WebContent/routing.js
+++ b/WebContent/routing.js
@@ -127,7 +127,6 @@ function onClickCreateShortcut(src){
 }
 function showRouteLink(response){
 	document.getElementById('route-prelink').innerHTML = '[<a id="gpx-link" class = "text-selectable" href="' +response.ShortURL+ '">'+response.ShortURL+'</a>]';
-	//document.getElementById('route-prelink').innerHTML = '[<a id="gpx-link" href="' +response.ShortURL+ '">'+OSRM.loc("LINK_TO_ROUTE")+'</a>]';	
 }
 function showRouteLink_TimeOut(){
 	document.getElementById('route-prelink').innerHTML = '['+OSRM.loc("LINK_TO_ROUTE_TIMEOUT")+']';
@@ -139,8 +138,8 @@ function showRouteDescription(response) {
 		query_string += '&loc=' + my_markers.route[i].getLat() + ',' + my_markers.route[i].getLng(); 
  						
 	// create link to the route
-	var route_link ='<span class="route-summary" id="route-prelink">[<a id="gpx-link" onclick="onClickCreateShortcut(\'' + OSRM.DEFAULTS.WEBSITE_URL + query_string + '\')">'+OSRM.loc("GET_LINK")+'</a>]</span>';
-	//var route_link ='<span class="route-summary" id="route-prelink">[<a id="gpx-link" href="#" onclick="onClickCreateShortcut(\'' + document.URL + query_string + '\')">'+OSRM.loc("GET_LINK")+'</a>]</span>';
+	var route_link ='<span class="route-summary" id="route-prelink">[<a id="gpx-link" href="#" onclick="onClickCreateShortcut(\'' + OSRM.DEFAULTS.WEBSITE_URL + query_string + '\')">'+OSRM.loc("GET_LINK")+'</a>]</span>';
+	alert(OSRM.DEFAULTS.WEBSITE_URL);
 
 	// create GPX link
 	var gpx_link = '<span class="route-summary">[<a id="gpx-link" onClick="javascript: document.location.href=\'' + OSRM.DEFAULTS.HOST_ROUTING_URL + query_string + '&output=gpx\';">'+OSRM.loc("GPX_FILE")+'</a>]</span>';