diff --git a/scheme/httpd/cgi-server.scm b/scheme/httpd/cgi-server.scm
index aa7971f..cc351fe 100644
--- a/scheme/httpd/cgi-server.scm
+++ b/scheme/httpd/cgi-server.scm
@@ -103,8 +103,8 @@
 	 (nph? (string-prefix? "nph-" prog))	; PROG starts with "nph-" ? 
 					; why did we had (string-suffix? "-nph" prog) here?
 
-	 (search (http-url-search (request-url req)))	; Compute the
-	 (argv (if (and search (not (string-index search #\=)))	; argv list.
+	 (search (http-url-query (request-url req)))	; Compute the
+
 		   (split-and-decode-search-spec search)
 		   '()))
 
@@ -205,7 +205,7 @@
 
 	  ,@request-invariant-cgi-env	; Stuff that never changes (see cgi-handler).
 
-	  ,@(cond ((http-url-search (request-url req)) =>
+	  ,@(cond ((http-url-query (request-url req)) =>
 		   (lambda (srch) `(("QUERY_STRING" . ,srch))))
 		  (else '()))
 
diff --git a/scheme/httpd/file-dir-handler.scm b/scheme/httpd/file-dir-handler.scm
index 33824f0..69be8a9 100644
--- a/scheme/httpd/file-dir-handler.scm
+++ b/scheme/httpd/file-dir-handler.scm
@@ -211,7 +211,7 @@
 ;;; ROOTED-FILE-OR-DIRECTORY-HANDLER for examples on how to feed this.
 
 (define (make-rooted-file-path-response root file-path file-serve-response req options)
-  (if (http-url-search (request-url req))
+  (if (http-url-query (request-url req))
       (make-error-response (status-code bad-request) req
 			   "Indexed search not provided for this URL.")
       (cond ((dotdot-check root file-path) =>
diff --git a/scheme/httpd/info-gateway.scm b/scheme/httpd/info-gateway.scm
index 1043fc6..4409ce4 100644
--- a/scheme/httpd/info-gateway.scm
+++ b/scheme/httpd/info-gateway.scm
@@ -117,7 +117,7 @@
 	  ((list? parse-info)		; it's an info path
 	   (lambda (url)
 	     (values parse-info
-		     (unescape-uri (http-url-search url)))))
+		     (unescape-uri (http-url-query url)))))
 	  (else
 	   (let ((info-path 
 		  ((infix-splitter ":") 
@@ -128,7 +128,7 @@
 			 "")))))
 	     (lambda (url)
 	       (values info-path
-		       (unescape-uri (http-url-search url))))))))
+		       (unescape-uri (http-url-query url))))))))
 	(make-reference
 	 (cond
 	  ((procedure? reference) reference)
diff --git a/scheme/httpd/rman-gateway.scm b/scheme/httpd/rman-gateway.scm
index 0eb9f39..9973b54 100644
--- a/scheme/httpd/rman-gateway.scm
+++ b/scheme/httpd/rman-gateway.scm
@@ -20,7 +20,7 @@
 	  ((list? finder)
 	   (lambda (url)
 	     (values finder
-		     (unescape-uri (http-url-search url))
+		     (unescape-uri (http-url-query url))
 		     '())))
 	  (else
 	   (let ((man-path 
@@ -32,7 +32,7 @@
 			 "")))))
 	     (lambda (url)
 	       (values man-path
-		       (unescape-uri (http-url-search url))
+		       (unescape-uri (http-url-query url))
 		       '()))))))
 	(reference-template
 	 (cond
diff --git a/scheme/httpd/surflets/bindings.scm b/scheme/httpd/surflets/bindings.scm
index 3ad33d9..757e5fd 100644
--- a/scheme/httpd/surflets/bindings.scm
+++ b/scheme/httpd/surflets/bindings.scm
@@ -26,7 +26,7 @@
 'application/x-www-form-urlencoded' as content-type"))
     (cond
      ((string=? request-method "GET")
-      (form-query-list (http-url-search 
+      (form-query-list (http-url-query 
 			(surflet-request-url surflet-request))))
      ((string=? request-method "POST")
       (or (cached-bindings surflet-request)
diff --git a/scheme/httpd/surflets/packages.scm b/scheme/httpd/surflets/packages.scm
index 13e12de..13d2222 100644
--- a/scheme/httpd/surflets/packages.scm
+++ b/scheme/httpd/surflets/packages.scm
@@ -659,7 +659,7 @@
 	weak				;weak pointers
 	surflets/utilities		;form-query-list
 	surflet-requests
-	(subset url (http-url-search))
+	(subset url (http-url-query))
 	(subset srfi-14 (char-set:digit))
 	(subset srfi-13 (string-index string-trim))
 	(subset srfi-1 (filter))
diff --git a/web-server/root/surflets/add-html.scm b/web-server/root/surflets/add-html.scm
index 76529e1..4c20444 100644
--- a/web-server/root/surflets/add-html.scm
+++ b/web-server/root/surflets/add-html.scm
@@ -28,7 +28,7 @@
 			 (p (url "/" "Return to main menu") (br)
 			    (url "add-html.scm" "Start new calculation."))))))))
 	(let* ((bindings (form-query-list
-			  (http-url-search (surflet-request-url result))))
+			  (http-url-query (surflet-request-url result))))
 	       (number (string->number 
 			(extract-single-binding "number" bindings))))
 	  (if number
diff --git a/web-server/root/surflets/add-raw.scm b/web-server/root/surflets/add-raw.scm
index ff05dfc..23e8de1 100644
--- a/web-server/root/surflets/add-raw.scm
+++ b/web-server/root/surflets/add-raw.scm
@@ -2,7 +2,7 @@
   (open	surflet-requests		; SURFLET-REQUEST-url
 	httpd-responses			; MAKE-RESPONSE
 	parse-html-forms		; PARSE-HTML-FORM-QUERY
-	url				; HTTP-url-SEARCH
+	url				; http-url-query
 	srfi-1				; FILTER
 	surflet-handler/surflets	; SEND/SUSPEND, SEND/FINISH
 	surflet-handler/primitives	; MAKE-SURFLET-RESPONSE
@@ -79,7 +79,7 @@
       (let* ((title (if (pair? maybe-title) (car maybe-title) #f))
 	     (result (send/suspend (make-get-number-page input-text title)))
 	     (bindings (parse-html-form-query
-			(http-url-search (surflet-request-url result))))
+			(http-url-query (surflet-request-url result))))
 	     (number (string->number 
 		      (extract-single-binding "number" bindings))))
 	(if number