diff --git a/WebContent/main.js b/WebContent/main.js
index 127641c5d..1ca6fdead 100644
--- a/WebContent/main.js
+++ b/WebContent/main.js
@@ -176,6 +176,9 @@ function checkURL(){
 	var called_url = document.location.search.substr(1,document.location.search.length);
 	if( called_url != '') {
 		var positions = [];
+		
+		var destination = undefined;
+		var destination_name = undefined;
 
 		// parse input (currently only parses start, dest, via)
 		var splitted_url = called_url.split('&');
@@ -184,12 +187,26 @@ function checkURL(){
 			if(name_val.length!=2)
 				continue;
 				
-			var coordinates = unescape(name_val[1]).split(',');
-			if(coordinates.length!=2)
-				continue;
-				
-			if(name_val[0] == 'loc')
-				positions.push ( new L.LatLng( coordinates[0], coordinates[1]) );
+			if(name_val[0] == 'loc') {
+				var coordinates = unescape(name_val[1]).split(',');
+				if(coordinates.length==2)
+					positions.push ( new L.LatLng( coordinates[0], coordinates[1]) );
+			}
+			else if(name_val[0] == 'dest') {
+				var coordinates = unescape(name_val[1]).split(',');
+				if(coordinates.length==2)				
+					destination = new L.LatLng( coordinates[0], coordinates[1]);
+			}
+			else if(name_val[0] == 'destname')
+				destination_name = name_val[1];			
+		}
+		
+		// destination given
+		if( destination != undefined ) {
+			onclickGeocoderResult("target", destination.lat, destination.lng, (destination_name == undefined) );
+			if( destination_name != undefined )
+				document.getElementById("input-target-name").value = decodeURI(destination_name);
+			return;
 		}
 
 		// draw via points
diff --git a/WebContent/routing.js b/WebContent/routing.js
index ca382ac52..7da8efa8b 100644
--- a/WebContent/routing.js
+++ b/WebContent/routing.js
@@ -139,7 +139,6 @@ function showRouteDescription(response) {
  						
 	// create link to the route
 	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>';