diff -ur nagios-2.0.original/cgi/status.c nagios-2.0/cgi/status.c
--- nagios-2.0.original/cgi/status.c	2006-01-20 17:34:53.000000000 +0000
+++ nagios-2.0/cgi/status.c	2006-03-29 14:12:42.290070161 +0100
@@ -1661,8 +1661,9 @@
 			if(temp_serviceextinfo!=NULL){
 				if(temp_serviceextinfo->icon_image!=NULL){
 					printf("<TD ALIGN=center valign=center>");
-					printf("<A HREF='%s?type=%d&host=%s",EXTINFO_CGI,DISPLAY_SERVICE_INFO,url_encode(temp_service->host_name));
-					printf("&service=%s'>",url_encode(temp_service->description));
+					printf("<A HREF='");
+					print_extra_service_url(temp_serviceextinfo->host_name, temp_serviceextinfo->description, temp_serviceextinfo->notes_url);
+					printf("'");
 					printf("<IMG SRC='%s%s' BORDER=0 WIDTH=%d HEIGHT=%d ALT='%s' TITLE='%s'>",url_logo_images_path,temp_serviceextinfo->icon_image,STATUS_ICON_WIDTH,STATUS_ICON_HEIGHT,(temp_serviceextinfo->icon_image_alt==NULL)?"":temp_serviceextinfo->icon_image_alt,(temp_serviceextinfo->icon_image_alt==NULL)?"":temp_serviceextinfo->icon_image_alt);
 					printf("</A>");
 					printf("</TD>\n");