===================================================================
RCS file: /cvs/mandoc/cgi.c,v
retrieving revision 1.121
retrieving revision 1.123
diff -u -p -r1.121 -r1.123
--- mandoc/cgi.c	2016/04/14 20:40:33	1.121
+++ mandoc/cgi.c	2016/04/15 00:14:17	1.123
@@ -1,4 +1,4 @@
-/*	$Id: cgi.c,v 1.121 2016/04/14 20:40:33 schwarze Exp $ */
+/*	$Id: cgi.c,v 1.123 2016/04/15 00:14:17 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015, 2016 Ingo Schwarze <schwarze@usta.de>
@@ -588,34 +588,37 @@ pg_searchres(const struct req *req, struct manpage *r,
 
 	resp_begin_html(200, NULL);
 	resp_searchform(req);
-	puts("<DIV CLASS=\"results\">");
-	puts("<TABLE>");
 
-	for (i = 0; i < sz; i++) {
-		printf("<TR>\n"
-		       "<TD CLASS=\"title\">\n"
-		       "<A HREF=\"/%s%s%s/%s",
-		    scriptname, *scriptname == '\0' ? "" : "/",
-		    req->q.manpath, r[i].file);
-		printf("\">");
-		html_print(r[i].names);
-		printf("</A>\n"
-		       "</TD>\n"
-		       "<TD CLASS=\"desc\">");
-		html_print(r[i].output);
-		puts("</TD>\n"
-		     "</TR>");
-	}
+	if (sz > 1) {
+		puts("<DIV CLASS=\"results\">");
+		puts("<TABLE>");
 
-	puts("</TABLE>\n"
-	     "</DIV>");
+		for (i = 0; i < sz; i++) {
+			printf("<TR>\n"
+			       "<TD CLASS=\"title\">\n"
+			       "<A HREF=\"/%s%s%s/%s",
+			    scriptname, *scriptname == '\0' ? "" : "/",
+			    req->q.manpath, r[i].file);
+			printf("\">");
+			html_print(r[i].names);
+			printf("</A>\n"
+			       "</TD>\n"
+			       "<TD CLASS=\"desc\">");
+			html_print(r[i].output);
+			puts("</TD>\n"
+			     "</TR>");
+		}
 
+		puts("</TABLE>\n"
+		     "</DIV>");
+	}
+
 	/*
 	 * In man(1) mode, show one of the pages
 	 * even if more than one is found.
 	 */
 
-	if (req->q.equal) {
+	if (req->q.equal || sz == 1) {
 		puts("<HR>");
 		iuse = 0;
 		priouse = 20;
@@ -816,12 +819,8 @@ format(const struct req *req, const char *file)
 	memset(&conf, 0, sizeof(conf));
 	conf.fragment = 1;
 	usepath = strcmp(req->q.manpath, req->p[0]);
-	mandoc_asprintf(&conf.man, "/%s?query=%%N&sec=%%S%s%s%s%s",
-	    scriptname,
-	    req->q.arch	? "&arch="       : "",
-	    req->q.arch	? req->q.arch    : "",
-	    usepath	? "&manpath="    : "",
-	    usepath	? req->q.manpath : "");
+	mandoc_asprintf(&conf.man, "/%s%s%%N.%%S",
+	    usepath ? req->q.manpath : "", usepath ? "/" : "");
 
 	mparse_result(mp, &man, NULL);
 	if (man == NULL) {