diff --git a/software/close.cgi b/software/close.cgi
index ea79e3ceb..a2ab1b511 100755
--- a/software/close.cgi
+++ b/software/close.cgi
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!//usr/local/bin/perl
 # close.cgi
 # Remove some class from the open list
 
@@ -7,5 +7,4 @@ require './software-lib.pl';
 @heiropen = &get_heiropen();
 @heiropen = grep { $_ ne $in{'what'} } @heiropen;
 &save_heiropen(\@heiropen);
-&redirect("tree.cgi#$in{'what'}");
-
+&redirect("tree.cgi#".&urlize($in{'what'}));
diff --git a/software/open.cgi b/software/open.cgi
index d69a9b1d3..c68531a7c 100755
--- a/software/open.cgi
+++ b/software/open.cgi
@@ -7,5 +7,5 @@ require './software-lib.pl';
 @heiropen = &get_heiropen();
 push(@heiropen, $in{'what'});
 &save_heiropen(\@heiropen);
-&redirect("tree.cgi#$in{'what'}");
+&redirect("tree.cgi#".&urlize($in{'what'}));
 
diff --git a/software/tree.cgi b/software/tree.cgi
index fcad5a8fd..46a9e5eb0 100755
--- a/software/tree.cgi
+++ b/software/tree.cgi
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/local/bin/bin/perl
 # tree.cgi
 # Display the package tree
 
@@ -40,6 +40,12 @@ foreach $c (sort { $a cmp $b } &unique(@class)) {
 $heiropen{""} = 1;
 
 # traverse the hierarchy
+if ($hasclasses) {
+	print &ui_link("closeall.cgi", $text{'index_close'});
+    print "\n";
+	print &ui_link("openall.cgi", $text{'index_open'});
+    print "<p>\n";
+	}
 print "<table width=100%>\n";
 &traverse("", 0);
 print "</table>\n";
@@ -76,7 +82,7 @@ if ($heiropen{$_[0]}) {
 	foreach $i (@order) {
 		if ($class[$i] eq $_[0]) {
 			print "<tr> <td nowrap>", $spacer x ($_[1]+1);
-			print "<img border=0 src=images/pack.gif></a>&nbsp;\n";
+			print "<img border=0 src=images/pack.gif>&nbsp;\n";
 			print &ui_link("edit_pack.cgi?package=".
 			      &urlize($pack[$i])."&version=".
 			      &urlize($vers[$i]), &html_escape($pack[$i].