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.4 -r1.5
--- openacs-4/packages/schema-browser/www/column-comments.tcl	27 Jun 2015 20:15:22 -0000	1.4
+++ openacs-4/packages/schema-browser/www/column-comments.tcl	20 Jan 2018 22:49:57 -0000	1.5
@@ -28,6 +28,7 @@
 
 if { $error_count > 0 } {
     ad_return_complaint $error_count $error_message
+    ad_script_abort
 }
 
 
Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -r1.502 -r1.503
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	22 Dec 2017 13:51:41 -0000	1.502
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	20 Jan 2018 22:55:39 -0000	1.503
@@ -1902,6 +1902,7 @@
       set errorInfo $::errorInfo
       if {[string match "*for parameter*" $errorMsg]} {
         ad_return_complaint 1 [ns_quotehtml $errorMsg]
+        ad_script_abort
       } else {
         ad_log error "render_includelet $includeletClass led to: $errorMsg ($errorCode)\n$errorInfo"
         set page_name [$includelet name]
Index: openacs-4/packages/attachments/www/detach.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/www/detach.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/attachments/www/detach.tcl	7 Aug 2017 23:48:04 -0000	1.5
+++ openacs-4/packages/attachments/www/detach.tcl	20 Jan 2018 22:59:51 -0000	1.6
@@ -79,6 +79,7 @@
 	}
     } -after_submit {
 	ad_returnredirect $return_url
+        ad_script_abort
     }
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/bookmarks/www/top-frame.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/top-frame.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/bookmarks/www/top-frame.tcl	26 Jun 2015 14:50:34 -0000	1.7
+++ openacs-4/packages/bookmarks/www/top-frame.tcl	20 Jan 2018 22:59:51 -0000	1.8
@@ -19,16 +19,16 @@
 
 set return_url [ad_urlencode "tree-frame?viewed_user_id=$viewed_user_id"]
 
-doc_return 200 text/html "<head>
+doc_return 200 text/html [subst {<head>
 <style>
 BODY {background-color: white}
 A {text-decoration: none; color: #0000bb}
 A:hover {text-decoration: underline}
 </style>
 </head>
 <body>
-<center><table width=100%cellpadding=0 border=0 cellspacing=0><tr><td>
-<form target=target_frame action=search><table width=100% cellpadding=1 border=0 bgcolor=#f3f3f3>
+<center><table width="100%" cellpadding="0" border="0" cellspacing="0"><tr><td>
+<form target="target_frame" action="search"><table width="100%" cellpadding="1" border="0" bgcolor="#f3f3f3">
 [export_vars -form viewed_user_id]
 <tr>
 [ad_decode $write_p "t" "<td bgcolor=#cccccc align=center valign=middle><font size=-1 face=arial, helvetica><b><a target=main href=bookmark-add-import?viewed_user_id=$viewed_user_id&return_url=$return_url>Add/Import</a></td>" ""]
@@ -39,13 +39,14 @@
 <table width=100% cellpadding=1 border=0 bgcolor=#f3f3f3>
 <input type=hidden name=return_url value=$return_url>
 <tr>
-<td bgcolor=#cccccc align=center valign=middle><font size=-1 face=arial, helvetica><b><a target=main href=\"javascript: top.frames\['main'\].expand_all(); \">Expand</a></td>
-<td bgcolor=#cccccc align=center valign=middle><font size=-1 face=arial, helvetica><b><a target=main href=\"javascript: top.frames\['main'\].collapse_all(); \">Collapse</a></td>
-<td bgcolor=#cccccc align=center valign=middle><font size=-1 face=arial, helvetica><b><a target=main href=tree-frame?viewed_user_id=$viewed_user_id>Refresh</a></td>
-<td bgcolor=#cccccc align=center valign=middle><font size=-1 face=arial, helvetica><b><a target=new href=index?viewed_user_id=$viewed_user_id>Main</a></td>
-<td bgcolor=#cccccc colspan=2 align=center valign=middle><font size=-1 face=arial, helvetica><b>Search <input size=10 name=search_text></td>
+<td bgcolor="#cccccc" align="center" valign="middle"><font size="-1" face="arial, helvetica"><b><a target="main" href="javascript: top.frames\['main'\].expand_all(); ">Expand</a></td>
+<td bgcolor="#cccccc" align="center" valign="middle"><font size="-1" face="arial, helvetica"><b><a target="main" href="javascript: top.frames\['main'\].collapse_all(); ">Collapse</a></td>
+<td bgcolor="#cccccc" align="center" valign="middle"><font size="-1" face="arial, helvetica"><b><a target="main" href="tree-frame?viewed_user_id=$viewed_user_id">Refresh</a></td>
+<td bgcolor="#cccccc" align="center" valign="middle"><font size="-1" face="arial, helvetica"><b><a target="new" href="index?viewed_user_id=$viewed_user_id">Main</a></td>
+<td bgcolor="#cccccc" colspan="2" align="center" valign="middle"><font size="-1" face="arial, helvetica"><b>Search <input size="10" name="search_text"></td>
 </tr>
 </form>
 </table>   
-</table>"
+</table>}]
+ad_script_abort
 
Index: openacs-4/packages/bookmarks/www/tree-dynamic.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/tree-dynamic.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/bookmarks/www/tree-dynamic.tcl	24 Sep 2015 07:32:15 -0000	1.9
+++ openacs-4/packages/bookmarks/www/tree-dynamic.tcl	20 Jan 2018 22:59:51 -0000	1.10
@@ -89,4 +89,5 @@
 append js "];\n"
 
 
-doc_return  200 text/plain "$js"
+doc_return  200 text/plain $js
+ad_script_abort
Index: openacs-4/packages/bookmarks/www/tree-frame.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/tree-frame.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/bookmarks/www/tree-frame.tcl	7 Aug 2014 07:36:55 -0000	1.4
+++ openacs-4/packages/bookmarks/www/tree-frame.tcl	20 Jan 2018 22:59:51 -0000	1.5
@@ -34,5 +34,6 @@
 </html>
 "
 
-doc_return 200 text/html "$page_content"
+doc_return 200 text/html $page_content
+ad_script_abort
 
Index: openacs-4/packages/bookmarks/www/tree.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/tree.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/bookmarks/www/tree.tcl	26 Jun 2015 14:50:34 -0000	1.5
+++ openacs-4/packages/bookmarks/www/tree.tcl	20 Jan 2018 22:59:51 -0000	1.6
@@ -21,4 +21,5 @@
 <body bgcolor=white>
 
 </html>"
+ad_script_abort