Index: openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl,v
diff -u -N -r1.30.2.4 -r1.30.2.5
--- openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl	2 Jan 2016 20:57:57 -0000	1.30.2.4
+++ openacs-4/packages/acs-subsite/www/admin/site-map/index.tcl	11 Aug 2016 13:25:21 -0000	1.30.2.5
@@ -105,13 +105,13 @@
                 <if @nodes.node_id@ ne -99999>
                   <a name="@nodes.node_id@">@nodes.tree_indent;noquote@</a>
                 <if @nodes.expand_mode@ eq 1>
-                  (<a href="?@nodes.expand_url@#@nodes.node_id@">+</a>)
+                  (<a href="@nodes.expand_url@#@nodes.node_id@">+</a>)
                 </if>
                 <if @nodes.expand_mode@ eq 2>
-                  (<a href="?@nodes.expand_url@#@nodes.node_id@">-</a>)
+                  (<a href="@nodes.expand_url@#@nodes.node_id@">-</a>)
                 </if>
                 <if @nodes.instance_url@ ne none>
-                  <a href="?@nodes.name_url@">@nodes.name;noquote@</a>
+                  <a href="@nodes.name_url@">@nodes.name;noquote@</a>
                 </if><else>
                   @nodes.name;noquote@
                 </else>
@@ -208,7 +208,7 @@
     set parameters_url ""
     set permissions_url ""
 
-    if { [lsearch -exact $open_nodes $parent_id] == -1 && $parent_id ne "" && $mylevel > 2 } { continue }
+    if { $parent_id ni $open_nodes && $parent_id ne "" && $mylevel > 2 } { continue }
 
     if {$directory_p == "t"} {
         set add_folder_url [export_vars -base . {expand:multiple root_id node_id {new_parent $node_id} {new_type folder}}]