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 -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}}]
Index: openacs-4/packages/acs-subsite/www/site-map/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/site-map/index.tcl,v
diff -u -r1.9.2.1 -r1.9.2.2
--- openacs-4/packages/acs-subsite/www/site-map/index.tcl	10 Sep 2015 08:21:53 -0000	1.9.2.1
+++ openacs-4/packages/acs-subsite/www/site-map/index.tcl	11 Aug 2016 13:25:21 -0000	1.9.2.2
@@ -91,10 +91,10 @@
 		    <a href="@nodes.instance_url@">@nodes.instance;noquote@</a>   
 		</else>
 		<if @nodes.expand_mode@ eq 1>
-		&nbsp;<a href="?@nodes.expand_url@#@nodes.node_id@"><img style="border:0" src="/resources/down.gif"></a>
+		&nbsp;<a href="@nodes.expand_url@#@nodes.node_id@"><img style="border:0" src="/resources/down.gif"></a>
 		</if>
 		<if @nodes.expand_mode@ eq 2>
-                &nbsp;<a href="?@nodes.expand_url@#@nodes.node_id@"><img style="border:0" src="/resources/up.gif"></a>
+                &nbsp;<a href="@nodes.expand_url@#@nodes.node_id@"><img style="border:0" src="/resources/up.gif"></a>
                 </if>
 
 		<if @nodes.action_type@ eq "new_folder">
@@ -144,7 +144,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}}]
@@ -211,7 +211,7 @@
 	
 	lappend urlvars "root_id=$root_id"
 	
-	set expand_url "[join $urlvars "&"]"
+	set expand_url [join $urlvars "&"]
     } else {
 	set expand_url ""
     }
@@ -225,7 +225,7 @@
 	if {$new_application == $node_id} {
 	    
 	    set action_type "new_app"
-	    set action_form_part "[export_vars -form {expand:multiple root_id node_id new_package_id}] [apm_application_new_checkbox]"
+	    set action_form_part [export_vars -form {expand:multiple root_id node_id new_package_id}] [apm_application_new_checkbox]
 	    
 	    #Generate a package_id for double click protection
 	    set new_package_id [db_nextval acs_object_id_seq]