--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/range/DistanceInfoDataSource.java	Fri Jan 19 20:30:47 2018 +0100
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/range/DistanceInfoDataSource.java	Mon Jan 22 16:38:32 2018 +0100
@@ -9,6 +9,7 @@
 package org.dive4elements.river.client.client.ui.range;
 
 import com.google.gwt.core.client.GWT;
+import com.google.gwt.http.client.URL;
 
 import com.smartgwt.client.data.DataSource;
 import com.smartgwt.client.data.DataSourceField;
@@ -48,12 +49,16 @@
     }
 
 
-    protected String getServiceURL(String server, String river, String filter) {
-        String url = GWT.getModuleBaseURL();
-        url += "distanceinfoxml";
-        url += "?server=" + server;
-        url += "&river=" + river;
-        url += "&filter=" + filter;
+    protected String getServiceURL(
+        String server,
+        String river,
+        String filter
+    ) {
+        String url = URL.encode(GWT.getModuleBaseURL()
+            + "distanceinfoxml"
+            + "?server=" + server
+            + "&river=" + river
+            + "&filter=" + filter);
 
         return url;
     }