Index: openacs-4/packages/schema-browser/tcl/schema-browser-procs-oracle.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/schema-browser/tcl/schema-browser-procs-oracle.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/schema-browser/tcl/schema-browser-procs-oracle.tcl	16 Sep 2013 09:54:29 -0000	1.3
+++ openacs-4/packages/schema-browser/tcl/schema-browser-procs-oracle.tcl	27 Jun 2015 20:15:21 -0000	1.4
@@ -35,7 +35,8 @@
                  if { $table_name == $selected_table_name } {
                      append return_string "<td><b>[string tolower $table_name]</b></td>"
 	         } else {
-                     append return_string "<td><a href=\"index?[export_vars -url {table_name}]\">[string tolower $table_name]</a></td>"
+		     set href [export_vars -base index {table_name}]
+		     append return_string [subst {<td><a href="[ns_quotehtml $href]">[string tolower $table_name]</a></td>}]
                  }
 	     }
           
@@ -62,7 +63,9 @@
         where
              table_name = upper(:table_name)
     " {
-        append return_string "\n--\t<a href=\"trigger?[export_vars -url {trigger_name}]\">$trigger_name</a> $triggering_event $trigger_type $status"
+	set href [export_vars -base trigger {trigger_name}]
+        append return_string [subst {
+	    --\t<a href="[ns_quotehtml $href]">$trigger_name</a> $triggering_event $trigger_type $status}]
     } if_no_rows {
         append return_string "\n--\tnone"
     }
Index: openacs-4/packages/schema-browser/tcl/schema-browser-procs-postgresql.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/schema-browser/tcl/schema-browser-procs-postgresql.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/schema-browser/tcl/schema-browser-procs-postgresql.tcl	16 Sep 2013 09:54:29 -0000	1.11
+++ openacs-4/packages/schema-browser/tcl/schema-browser-procs-postgresql.tcl	27 Jun 2015 20:15:21 -0000	1.12
@@ -52,7 +52,9 @@
                  if { $table_name == $selected_table_name } {
                      append return_string "<td><b>[string tolower $table_name]</b></td>"
 	         } else {
-                     append return_string "<td><a href=\"index?[export_vars -url {table_name}]\">[string tolower $table_name]</a></td>"
+		     set href [export_vars -base index {table_name}]
+		     append return_string [subst {<td><a href="[ns_quotehtml $href]">[string tolower $table_name]</a></td>}]
+
                  }
 	     }
           
Index: openacs-4/packages/schema-browser/www/column-comments-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/schema-browser/www/column-comments-2.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/schema-browser/www/column-comments-2.tcl	9 Sep 2013 17:34:17 -0000	1.4
+++ openacs-4/packages/schema-browser/www/column-comments-2.tcl	27 Jun 2015 20:15:22 -0000	1.5
@@ -28,4 +28,4 @@
 
 db_dml comment_add "comment on column ${table_name}.$column_name is :comments"
 
-ad_returnredirect "index?[export_vars -url {table_name}]"
+ad_returnredirect [export_vars -base index {table_name}]
Index: openacs-4/packages/schema-browser/www/column-comments.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/schema-browser/www/column-comments.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/schema-browser/www/column-comments.tcl	9 Sep 2013 17:34:17 -0000	1.3
+++ openacs-4/packages/schema-browser/www/column-comments.tcl	27 Jun 2015 20:15:22 -0000	1.4
@@ -36,20 +36,21 @@
 select comments from user_col_comments where table_name = upper(:table_name) and column_name = upper(:column_name)"
 ]
 
-set page_content "
+set href [export_vars -base index {table_name}]
+set page_content [subst {
 <h2>ArsDigita Schema Browser</h2>
 <hr>
-<a href=\"index?[export_vars -url {table_name}]\">Tables</a> : Column Comment
+    <a href="[ns_quotehtml $href]">Tables</a> : Column Comment
 <p>
 <b>Enter or revise the comment on $table_name.$column_name:</b>
-<form method=post action=\"column-comments-2\">
+<form method=post action="column-comments-2">
 [export_vars -form {table_name column_name}]
-<textarea name=\"comments\" rows=\"4\" cols=\"40\" wrap=soft>$comments</textarea>
+<textarea name="comments" rows="4" cols="40" wrap="soft">$comments</textarea>
 <p>
-<input type=submit value=\"Save comment\">
+<input type="submit" value="Save comment">
 </form>
 <hr>
-"
+}]
 
 
 doc_return 200 text/html $page_content