diff --git a/modules/services/nominatim.js b/modules/services/nominatim.js
index 3362d9f40e..e0a9df8b1d 100644
--- a/modules/services/nominatim.js
+++ b/modules/services/nominatim.js
@@ -81,8 +81,12 @@ export default {
 
 
     search: function (val, callback) {
-        var searchVal = encodeURIComponent(val);
-        var url = apibase + 'search/' + searchVal + '?limit=10&format=json';
+        const params = {
+            q: val,
+            limit:10,
+            format: 'json'
+        };
+        var url = apibase + 'search?' + utilQsString(params);
 
         if (_inflight[url]) return;
         var controller = new AbortController();