Index: openacs-4/packages/categories/www/search-result.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/search-result.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/categories/www/search-result.tcl	7 Aug 2017 23:48:05 -0000	1.4
+++ openacs-4/packages/categories/www/search-result.tcl	19 Jan 2018 14:50:04 -0000	1.5
@@ -35,7 +35,7 @@
 	synonym_name {
 	    label "Search Result"
 	    display_template {
-		@search_result.synonym_name@<if @search_result.synonym_p@ eq t> (@search_result.category_name@)</if>
+		@search_result.synonym_name@<if @search_result.synonym_p;literal@ true> (@search_result.category_name@)</if>
 	    }
 	}
     }
Index: openacs-4/packages/categories/www/cadmin/category-delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-delete-2.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/categories/www/cadmin/category-delete-2.tcl	7 Aug 2017 23:48:05 -0000	1.11
+++ openacs-4/packages/categories/www/cadmin/category-delete-2.tcl	19 Jan 2018 14:50:04 -0000	1.12
@@ -26,6 +26,7 @@
 }
 
 ad_returnredirect [export_vars -no_empty -base tree-view {tree_id locale object_id ctx_id}]
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/categories/www/cadmin/category-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-delete.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/categories/www/cadmin/category-delete.tcl	7 Aug 2017 23:48:05 -0000	1.12
+++ openacs-4/packages/categories/www/cadmin/category-delete.tcl	19 Jan 2018 14:50:04 -0000	1.13
@@ -50,13 +50,13 @@
 	category_name {
 	    label "Name"
 	    display_template {
-		<if @categories.objects_p@ true><a href="@categories.view_url@">@categories.category_name@</a></if>
+		<if @categories.objects_p;literal@ true><a href="@categories.view_url@">@categories.category_name@</a></if>
 		<else>@categories.category_name@</else>
 	    }
 	}
 	objects_p {
 	    display_template {
-		<if @categories.objects_p@ true>(Still mapped to objects)</if>
+		<if @categories.objects_p;literal@ true>(Still mapped to objects)</if>
 	    }
 	}
     }
Index: openacs-4/packages/categories/www/cadmin/category-link-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-link-add-2.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/categories/www/cadmin/category-link-add-2.tcl	7 Aug 2017 23:48:05 -0000	1.9
+++ openacs-4/packages/categories/www/cadmin/category-link-add-2.tcl	19 Jan 2018 14:50:04 -0000	1.10
@@ -71,8 +71,8 @@
 	links {
 	    sub_class narrow
 	    display_template {
-		<if @tree.backward_exists_p@ true><img src="/resources/acs-subsite/left.gif" height="16" width="16" alt="backward link" style="border:0"></if>
-		<if @tree.forward_exists_p@ true><img src="/resources/acs-subsite/right.gif" height="16" width="16" alt="forward link" style="border:0"></if>
+		<if @tree.backward_exists_p;literal@ true><img src="/resources/acs-subsite/left.gif" height="16" width="16" alt="backward link" style="border:0"></if>
+		<if @tree.forward_exists_p;literal@ true><img src="/resources/acs-subsite/right.gif" height="16" width="16" alt="forward link" style="border:0"></if>
 	    }
 	    html {align center}
 	}
Index: openacs-4/packages/categories/www/cadmin/category-link-add-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-link-add-3.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/categories/www/cadmin/category-link-add-3.tcl	7 Aug 2017 23:48:05 -0000	1.6
+++ openacs-4/packages/categories/www/cadmin/category-link-add-3.tcl	19 Jan 2018 14:50:04 -0000	1.7
@@ -26,6 +26,7 @@
 }
 
 ad_returnredirect [export_vars -no_empty -base category-links-view {category_id tree_id locale object_id ctx_id}]
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/categories/www/cadmin/category-link-add-4.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-link-add-4.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/categories/www/cadmin/category-link-add-4.tcl	7 Aug 2017 23:48:05 -0000	1.6
+++ openacs-4/packages/categories/www/cadmin/category-link-add-4.tcl	19 Jan 2018 14:50:04 -0000	1.7
@@ -30,6 +30,7 @@
 }
 
 ad_returnredirect [export_vars -no_empty -base category-links-view {category_id tree_id locale object_id ctx_id}]
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/categories/www/cadmin/category-link-delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-link-delete-2.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/categories/www/cadmin/category-link-delete-2.tcl	7 Aug 2017 23:48:05 -0000	1.7
+++ openacs-4/packages/categories/www/cadmin/category-link-delete-2.tcl	19 Jan 2018 14:50:04 -0000	1.8
@@ -26,6 +26,7 @@
 }
 
 ad_returnredirect [export_vars -no_empty -base category-links-view {category_id tree_id locale object_id ctx_id}]
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/categories/www/cadmin/category-links-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-links-view.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/categories/www/cadmin/category-links-view.tcl	7 Aug 2017 23:48:05 -0000	1.9
+++ openacs-4/packages/categories/www/cadmin/category-links-view.tcl	19 Jan 2018 14:50:04 -0000	1.10
@@ -63,7 +63,7 @@
     -elements {
 	checkbox {
 	    display_template {
-		<if @category_links.write_p@ eq t><input type="checkbox" name="link_id" value="@category_links.link_id@" id="category_links,@category_links.link_id@" title="Check/uncheck this row, and select an action to perform below"></if>
+		<if @category_links.write_p;literal@ true><input type="checkbox" name="link_id" value="@category_links.link_id@" id="category_links,@category_links.link_id@" title="Check/uncheck this row, and select an action to perform below"></if>
 	    }
 	}
 	direction {
Index: openacs-4/packages/categories/www/cadmin/category-parent-change-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-parent-change-2.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/categories/www/cadmin/category-parent-change-2.tcl	7 Aug 2017 23:48:05 -0000	1.4
+++ openacs-4/packages/categories/www/cadmin/category-parent-change-2.tcl	19 Jan 2018 14:50:04 -0000	1.5
@@ -18,6 +18,7 @@
 category::change_parent -tree_id $tree_id -category_id $category_id -parent_id $parent_id
 
 ad_returnredirect [export_vars -no_empty -base tree-view {tree_id locale object_id ctx_id}]
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/categories/www/cadmin/category-phase-in.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-phase-in.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/categories/www/cadmin/category-phase-in.tcl	7 Aug 2017 23:48:05 -0000	1.7
+++ openacs-4/packages/categories/www/cadmin/category-phase-in.tcl	19 Jan 2018 14:50:04 -0000	1.8
@@ -21,6 +21,7 @@
 category_tree::flush_cache $tree_id
 
 ad_returnredirect [export_vars -no_empty -base tree-view { tree_id locale object_id ctx_id}]
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/categories/www/cadmin/category-phase-out.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-phase-out.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/categories/www/cadmin/category-phase-out.tcl	7 Aug 2017 23:48:05 -0000	1.8
+++ openacs-4/packages/categories/www/cadmin/category-phase-out.tcl	19 Jan 2018 14:50:04 -0000	1.9
@@ -21,6 +21,7 @@
 category_tree::flush_cache $tree_id
 
 ad_returnredirect [export_vars -no_empty -base tree-view { tree_id locale object_id ctx_id}]
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/categories/www/cadmin/object-map.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/object-map.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/categories/www/cadmin/object-map.tcl	7 Aug 2017 23:48:05 -0000	1.8
+++ openacs-4/packages/categories/www/cadmin/object-map.tcl	19 Jan 2018 14:50:04 -0000	1.9
@@ -69,10 +69,10 @@
 	}
         flags {
 	    display_template {
-		(<if @mapped_trees.site_wide_p@ eq t>#categories.#SiteWide_tree#, </if>
+		(<if @mapped_trees.site_wide_p;literal@ true>#categories.#SiteWide_tree#, </if>
                  <if @mapped_trees.widget@>@mapped_trees.widget@, </if>
-		 <if @mapped_trees.assign_single_p@ eq t>#categories.single#, </if><else>#categories.multiple#, </else>
-		 <if @mapped_trees.require_category_p@ eq t>#categories.required#) </if><else>#categories.optional#) </else>
+		 <if @mapped_trees.assign_single_p;literal@ true>#categories.single#, </if><else>#categories.multiple#, </else>
+		 <if @mapped_trees.require_category_p;literal@ true>#categories.required#) </if><else>#categories.optional#) </else>
 	    }
 	}
 	action {
@@ -94,7 +94,7 @@
 	}
 	site_wide_p {
 	    display_template {
-		<if @unmapped_trees.site_wide_p@ eq t> (#categories.SiteWide_tree#) </if>
+		<if @unmapped_trees.site_wide_p;literal@ true> (#categories.SiteWide_tree#) </if>
 	    }
 	}
 	action {
Index: openacs-4/packages/categories/www/cadmin/one-object.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/one-object.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/categories/www/cadmin/one-object.tcl	7 Aug 2017 23:48:05 -0000	1.10
+++ openacs-4/packages/categories/www/cadmin/one-object.tcl	19 Jan 2018 14:50:04 -0000	1.11
@@ -10,6 +10,7 @@
 }
 
 ad_returnredirect [export_vars -no_empty -base object-map { locale object_id }]
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/categories/www/cadmin/site-wide-status-change.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/site-wide-status-change.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/categories/www/cadmin/site-wide-status-change.tcl	7 Aug 2017 23:48:05 -0000	1.7
+++ openacs-4/packages/categories/www/cadmin/site-wide-status-change.tcl	19 Jan 2018 14:50:04 -0000	1.8
@@ -17,6 +17,7 @@
 db_dml toggle_site_wide_status ""
 
 ad_returnredirect [export_vars -no_empty -base permission-manage {tree_id locale object_id}]
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/categories/www/cadmin/synonym-delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/synonym-delete-2.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/categories/www/cadmin/synonym-delete-2.tcl	7 Aug 2017 23:48:05 -0000	1.5
+++ openacs-4/packages/categories/www/cadmin/synonym-delete-2.tcl	19 Jan 2018 14:50:04 -0000	1.6
@@ -26,6 +26,7 @@
 }
 
 ad_returnredirect [export_vars -no_empty -base synonyms-view {category_id tree_id locale object_id ctx_id}]
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/categories/www/cadmin/tree-copy-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-copy-2.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/categories/www/cadmin/tree-copy-2.tcl	7 Aug 2017 23:48:05 -0000	1.8
+++ openacs-4/packages/categories/www/cadmin/tree-copy-2.tcl	19 Jan 2018 14:50:04 -0000	1.9
@@ -19,6 +19,7 @@
 category_tree::copy -source_tree $source_tree_id -dest_tree $target_tree_id
 
 ad_returnredirect [export_vars -no_empty -base tree-view {tree_id locale object_id ctx_id}]
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/categories/www/cadmin/tree-copy.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-copy.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/categories/www/cadmin/tree-copy.tcl	7 Aug 2017 23:48:05 -0000	1.13
+++ openacs-4/packages/categories/www/cadmin/tree-copy.tcl	19 Jan 2018 14:50:04 -0000	1.14
@@ -53,7 +53,7 @@
 	}
 	site_wide_p {
 	    display_template {
-		<if @trees.site_wide_p@ eq t> (#categories.SiteWide_tree#) </if>
+		<if @trees.site_wide_p;literal@ true> (#categories.SiteWide_tree#) </if>
 	    }
 	}
 	copy {
Index: openacs-4/packages/categories/www/cadmin/tree-delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-delete-2.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/categories/www/cadmin/tree-delete-2.tcl	7 Aug 2017 23:48:05 -0000	1.10
+++ openacs-4/packages/categories/www/cadmin/tree-delete-2.tcl	19 Jan 2018 14:50:04 -0000	1.11
@@ -28,7 +28,9 @@
 } else {
     ad_returnredirect [export_vars -no_empty -base object-map {locale object_id ctx_id}]
 }
+ad_script_abort
 
+
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4
Index: openacs-4/packages/categories/www/cadmin/tree-order-update.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-order-update.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/categories/www/cadmin/tree-order-update.tcl	7 Aug 2017 23:48:05 -0000	1.7
+++ openacs-4/packages/categories/www/cadmin/tree-order-update.tcl	19 Jan 2018 14:50:04 -0000	1.8
@@ -79,6 +79,7 @@
 }
 
 ad_returnredirect [export_vars -no_empty -base tree-view {tree_id locale object_id ctx_id}]
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/categories/www/cadmin/tree-unmap-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-unmap-2.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/categories/www/cadmin/tree-unmap-2.tcl	7 Aug 2017 23:48:05 -0000	1.8
+++ openacs-4/packages/categories/www/cadmin/tree-unmap-2.tcl	19 Jan 2018 14:50:04 -0000	1.9
@@ -22,6 +22,7 @@
 category_tree::unmap -tree_id $tree_id -object_id $object_id
 
 ad_returnredirect [export_vars -no_empty -base object-map {locale object_id ctx_id}]
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/categories/www/cadmin/tree-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-view.tcl,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/categories/www/cadmin/tree-view.tcl	7 Aug 2017 23:48:05 -0000	1.19
+++ openacs-4/packages/categories/www/cadmin/tree-view.tcl	19 Jan 2018 14:50:04 -0000	1.20
@@ -92,7 +92,7 @@
     label "#categories.Category#"
     display_template {
 	@one_tree.left_indent;noquote@<a href="@one_tree.usage_url@" title="Show usage of this category">@one_tree.category_name@</a>
-	<if @one_tree.deprecated_p@ true>(#categories.Deprecated# - <a href="@one_tree.phase_in_url@">#categories.Restore#</a>)</if>
+	<if @one_tree.deprecated_p;literal@ true>(#categories.Deprecated# - <a href="@one_tree.phase_in_url@">#categories.Restore#</a>)</if>
     }
 }