diff --git a/WebContent/base/OSRM.HistoryRoutes.js b/WebContent/base/OSRM.HistoryRoutes.js
index 1e96c3b96..78f743a56 100644
--- a/WebContent/base/OSRM.HistoryRoutes.js
+++ b/WebContent/base/OSRM.HistoryRoutes.js
@@ -169,7 +169,7 @@ OSRM.extend( OSRM.HistoryRoute,{
 			}
 	},
 	_buildCall: function(history_id) {
-		var source = OSRM.DEFAULTS.HOST_ROUTING_URL[OSRM.G.active_routing_server];
+		var source = OSRM.G.active_routing_server_url;
 		source += '?z=' + OSRM.G.map.getZoom() + '&output=json&jsonp=%jsonp';
 		
 		if(this._history[history_id].checksum)
diff --git a/WebContent/main.js b/WebContent/main.js
index 254842fdf..d40df8834 100644
--- a/WebContent/main.js
+++ b/WebContent/main.js
@@ -239,10 +239,10 @@ OSRM.parseParameters = function(){
 			params.active_alternative = active_alternative;
 		}
 		else if(name_val[0] == 'rs') {
-			var active_routing_server = Number(name_val[1]);
-			if( active_routing_server<0 || active_routing_server>=OSRM.DEFAULTS.HOST_ROUTING_URL.length)
+			var active_routing_server_id = Number(name_val[1]);
+			if( active_routing_server_id<0 || active_routing_server_id>=OSRM.DEFAULTS.HOST_ROUTING_URL.length)
 				return;
-			params.active_routing_server = active_routing_server;
+			params.active_routing_server_id = active_routing_server_id;
 		}		
 	}
 		
@@ -287,7 +287,8 @@ OSRM.parseParameters = function(){
 		OSRM.G.active_alternative = params.active_alternative || 0;
 		
 		// set routing server
-		OSRM.G.active_routing_server = params.active_routing_server || 0;
+		OSRM.G.active_routing_server_id = params.active_routing_server_id || 0;
+		OSRM.G.active_routing_server_url = OSRM.DEFAULTS.HOST_ROUTING_URL[ OSRM.G.active_routing_server_id ];
 			
 		// compute route
 		OSRM.Routing.getRoute({keepAlternative:true});
diff --git a/WebContent/routing/OSRM.Routing.js b/WebContent/routing/OSRM.Routing.js
index 4cf924fbb..7e481b18e 100644
--- a/WebContent/routing/OSRM.Routing.js
+++ b/WebContent/routing/OSRM.Routing.js
@@ -31,7 +31,8 @@ OSRM.Routing = {
 		
 // init routing data structures
 init: function() {
-	OSRM.G.active_routing_server = 0;
+	OSRM.G.active_routing_server_id = 0;
+	OSRM.G.active_routing_server_url = OSRM.DEFAULTS.HOST_ROUTING_URL[ OSRM.G.active_routing_server_id ];
 	OSRM.G.markers = new OSRM.Markers();	
 	OSRM.G.route = new OSRM.Route();
 	OSRM.G.response = { via_points:[] };
@@ -160,7 +161,7 @@ draggingTimeout: function() {
 },
 
 _buildCall: function() {
-	var source = OSRM.DEFAULTS.HOST_ROUTING_URL[OSRM.G.active_routing_server];
+	var source = OSRM.G.active_routing_server_url;
 	source += '?z=' + OSRM.G.map.getZoom() + '&output=json&jsonp=%jsonp';	
 	if(OSRM.G.markers.checksum)
 		source += '&checksum=' + OSRM.G.markers.checksum;
diff --git a/WebContent/routing/OSRM.RoutingDescription.js b/WebContent/routing/OSRM.RoutingDescription.js
index 553adb597..c72f4142b 100644
--- a/WebContent/routing/OSRM.RoutingDescription.js
+++ b/WebContent/routing/OSRM.RoutingDescription.js
@@ -31,7 +31,7 @@ onClickCreateShortcut: function(src){
 	src += '&z='+ OSRM.G.map.getZoom() + '&center=' + OSRM.G.map.getCenter().lat.toFixed(6) + ',' + OSRM.G.map.getCenter().lng.toFixed(6);
 	src += '&alt='+OSRM.G.active_alternative;
 	src += '&df=' + OSRM.G.DISTANCE_FORMAT;
-	src += '&rs=' + OSRM.G.active_routing_server;
+	src += '&rs=' + OSRM.G.active_routing_server_id;
 	
 	var source = OSRM.DEFAULTS.SHORTENER_PARAMETERS.replace(/%url/, OSRM.DEFAULTS.HOST_SHORTENER_URL+src); 
 	
@@ -62,7 +62,7 @@ show: function(response) {
 	var route_link ='[<a class="route-link" onclick="OSRM.RoutingDescription.onClickCreateShortcut(\'' + OSRM.DEFAULTS.WEBSITE_URL + query_string + '\')">'+OSRM.loc("GET_LINK_TO_ROUTE")+'</a>]';
 
 	// create GPX link
-	var gpx_link = '[<a class="route-link" onClick="document.location.href=\'' + OSRM.DEFAULTS.HOST_ROUTING_URL[OSRM.G.active_routing_server] + query_string + '&output=gpx\';">'+OSRM.loc("GPX_FILE")+'</a>]';
+	var gpx_link = '[<a class="route-link" onClick="document.location.href=\'' + OSRM.G.active_routing_server_url + query_string + '&output=gpx\';">'+OSRM.loc("GPX_FILE")+'</a>]';
 		
 	// create route description
 	var positions = OSRM.G.route.getPositions();