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.2.2 -r1.30.2.3
--- openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl	29 Sep 2013 19:23:18 -0000	1.30.2.2
+++ openacs-4/packages/acs-tcl/tcl/navigation-procs.tcl	12 Oct 2013 13:55:18 -0000	1.30.2.3
@@ -181,7 +181,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 +387,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"