diff --git a/bin/corehandlers.rc b/bin/corehandlers.rc
index ddcf8a9..a50ae36 100644
--- a/bin/corehandlers.rc
+++ b/bin/corehandlers.rc
@@ -24,7 +24,7 @@ fn nav_tree {
 
         bname = $NF d
         path = $0 d
-        gsub("_", " ", bname)
+        gsub(/[\-_]/, " ", bname)
 
         if(index(ENVIRON["req_path"] "/", path) == 1)
             print "<li><a href=\"" path "\" class=\"thisPage\">&raquo;<i> " bname "</i></a></li>"
diff --git a/bin/werc.rc b/bin/werc.rc
index 9dc2176..2c6aa88 100755
--- a/bin/werc.rc
+++ b/bin/werc.rc
@@ -70,7 +70,7 @@ fn werc_exec_request {
         perm_redirect $req_path^'/'
 
     if(! ~ $#args 0)
-        pageTitle=`{ echo $args|sed -e 's/([a-z])-([a-z])/\1 \2/g' -e 's/ / - /g' -e 's/_/ /g' }
+        ifs=$NEW_LINE { pageTitle=`{ echo $args|sed -e 's/ / - /g' -e 's/([a-z])-([a-z])/\1 \2/g' -e 's/_/ /g' } }
 
     cd $sitedir
     req_paths_list='/' # Note: req_paths_list doesn't include 'stnythetic' dirs.
diff --git a/tpl/sitemap.tpl b/tpl/sitemap.tpl
index cf2e042..ac03874 100644
--- a/tpl/sitemap.tpl
+++ b/tpl/sitemap.tpl
@@ -47,7 +47,7 @@ fn listDir {
             u=`{echo $i|sed 's!'$sitedir'!!; '$dirclean's!/index$!/!; '}
             if(! ~ $#desc 0 && ! ~ $desc '')
                 desc=' - '$"desc
-            n=`{echo /$u|sed 's/_/ /g; s,.*/([^/]+)/?$,\1,'}
+            n=`{echo /$u|sed 's/[\-_]/ /g; s,.*/([^/]+)/?$,\1,'}
             echo '<li><a href="'$base_url$u'">'^$"n^'</a>' $"desc '</li>' 
             echo $base_url^$u >> $tmpfile
             if(test -d $i)