Index: openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl,v
diff -u -r1.30 -r1.31
--- openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl	12 Apr 2013 16:12:56 -0000	1.30
+++ openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl	27 Oct 2014 16:40:07 -0000	1.31
@@ -39,7 +39,7 @@
     }
 
     set out {}
-    foreach element [lrange $context 0 [expr {[llength $context] - 2}]] { 
+    foreach element [lrange $context 0 [llength $context]-2] { 
         append out "<a href=\"[lindex $element 0]\">[lindex $element 1]</a> $separator "
     }
     append out [lindex $context end]
@@ -106,7 +106,7 @@
 	return ""
     }
     
-    if { ![exists_and_not_null node_id] } {
+    if { ![info exists node_id] || $node_id eq "" } {
         set node_id [ad_conn node_id]
     }
 
@@ -124,8 +124,7 @@
     template::multirow create $multirow url label
 
     foreach elm [ad_context_node_list -from_node $from_node $node_id] {
-        set elm_0 [lindex $elm 0]
-        set elm_1 [lindex $elm 1]
+	lassign $elm elm_0 elm_1
         if { $node_id_url_end > 0 && [string match -nocase $node_id_url [string range $elm_0 0 ${node_id_url_end}-1] ] } {
             set elm_0 [string range $elm_0 $node_id_url_end end]
         }
@@ -168,7 +167,7 @@
 	return ""
     }
 
-    if { ![exists_and_not_null node_id] } {
+    if { ![info exists node_id] || $node_id eq "" } {
         set node_id [ad_conn node_id]
     }
 
@@ -181,7 +180,7 @@
 
     if {[llength $args] == 0} { 
         # fix last element to just be literal string
-        set context [lreplace $context end end [lindex [lindex $context end] 1]]
+        set context [lreplace $context end end [lindex $context end 1]]
     } else {
 	if {![string match "\{*" $args]} {
 	    # args is not a list, transform it into one.
@@ -387,7 +386,7 @@
 	# the current url then select it
 	if {$highlight_url ne "" && $highlight_url == [lindex $urls $counter]} {
  	    append return_string "<OPTION VALUE=\"[lindex $urls $counter]\" selected>$item"
-	} elseif {$highlight_url eq "" && [string match *$url_stub* [lindex $urls $counter]]} {
+	} elseif {$highlight_url eq "" && [string match "*$url_stub*" [lindex $urls $counter]]} {
 	    append return_string "<OPTION VALUE=\"[lindex $urls $counter]\" selected>$item"
 	} else {
 	    append return_string "<OPTION VALUE=\"[lindex $urls $counter]\">$item"