Index: openacs-4/packages/contacts/lib/contact-complaint-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contact-complaint-list.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/contacts/lib/contact-complaint-list.adp	8 Sep 2006 13:48:09 -0000	1.5
+++ openacs-4/packages/contacts/lib/contact-complaint-list.adp	12 Aug 2018 12:22:48 -0000	1.6
@@ -1,6 +1,6 @@
 <table cellpadding="3" cellspacing="3" width="100%">
   <tr>
-    <if @filter_p@ eq 1>
+    <if @filter_p;literal@ true>
       <td class="list-filter-pane-big" valign="top" width="20%">
           <listfilters name="complaint"></listfilters>
       </td>            
Index: openacs-4/packages/contacts/lib/contact-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contact-master.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/contacts/lib/contact-master.adp	22 Jun 2007 05:33:11 -0000	1.7
+++ openacs-4/packages/contacts/lib/contact-master.adp	12 Aug 2018 12:22:48 -0000	1.8
@@ -11,7 +11,7 @@
   <div id="section">
     <ul>
     <multiple name="links">
-      <li><a href="@links.url@" title="Go to @links.label@"><if @links.selected_p@><strong></if>@links.label@<if @links.selected_p@></strong></if></a><if @links:rowcount@ eq @links.rownum@ and @public_url@ nil><em>&nbsp;</em></if> </li>
+      <li><a href="@links.url@" title="Go to @links.label@"><if @links.selected_p;literal@ true><strong></if>@links.label@<if @links.selected_p;literal@ true></strong></if></a><if @links:rowcount@ eq @links.rownum@ and @public_url@ nil><em>&nbsp;</em></if> </li>
     </multiple>
     <if @public_url@ not nil>
       <li><a href="@public_url@" title="Go to this community member's public page">#contacts.Public_Page#</a><em>&nbsp;</em> </li>
Index: openacs-4/packages/contacts/lib/contact-privacy.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contact-privacy.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/lib/contact-privacy.adp	2 Jun 2006 09:18:30 -0000	1.1
+++ openacs-4/packages/contacts/lib/contact-privacy.adp	12 Aug 2018 12:22:48 -0000	1.2
@@ -1,4 +1,4 @@
-<if @gone_p@ true>
+<if @gone_p;literal@ true>
   <if @object_type@ eq organization>
     <h3 class="contact-title contact-privacy">#contacts.This_organization_has_closed_down#</h3>
   </if>
@@ -7,7 +7,7 @@
   </else>
 </if>
 <else>
-  <if @email_p@ false><h3 class="contact-title contact-privacy">#contacts.Do_not_email#</h3></if>
+  <if @email_p;literal@ false><h3 class="contact-title contact-privacy">#contacts.Do_not_email#</h3></if>
   <if @mail_p@  false><h3 class="contact-title contact-privacy">#contacts.Do_not_mail#</h3></if>
-  <if @phone_p@ false><h3 class="contact-title contact-privacy">#contacts.Do_not_phone#</h3></if>
+  <if @phone_p;literal@ false><h3 class="contact-title contact-privacy">#contacts.Do_not_phone#</h3></if>
 </else>
Index: openacs-4/packages/contacts/lib/contacts-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contacts-master.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/contacts/lib/contacts-master.adp	8 Feb 2008 17:13:27 -0000	1.8
+++ openacs-4/packages/contacts/lib/contacts-master.adp	12 Aug 2018 12:22:48 -0000	1.9
@@ -12,7 +12,7 @@
   <div id="section">
     <ul>
     <multiple name="links">
-      <li><a href="@links.url@" title="Go to @links.label@" id="@links.id@"><if @links.selected_p@><strong></if>@links.label@<if @links.selected_p@></strong></if></a><if @links:rowcount@ eq @links.rownum@><em>&nbsp;</em></if> </li>
+      <li><a href="@links.url@" title="Go to @links.label@" id="@links.id@"><if @links.selected_p;literal@ true><strong></if>@links.label@<if @links.selected_p;literal@ true></strong></if></a><if @links:rowcount@ eq @links.rownum@><em>&nbsp;</em></if> </li>
     </multiple>
     </ul>
   </div>
Index: openacs-4/packages/contacts/lib/contacts.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contacts.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/contacts/lib/contacts.adp	5 Apr 2006 22:19:02 -0000	1.9
+++ openacs-4/packages/contacts/lib/contacts.adp	12 Aug 2018 12:22:48 -0000	1.10
@@ -1,4 +1,4 @@
-<if @report_p@>
+<if @report_p;literal@ true>
 <p>
   <a href="@contacts_mode_url;noquote@" class="button">#contacts.View_Contacts#</a>
   <a href="@report_csv_url;noquote@" class="button">#contacts.CSV#</a>
@@ -37,7 +37,7 @@
   </if>
   <if @extended_columns@ not nil>
     <td>
-      <if @report_p@ true>
+      <if @report_p;literal@ true>
         <a href="@contacts_mode_url;noquote@" class="button">#contacts.View_Contacts#</a>
       </if>
       <else>
Index: openacs-4/packages/contacts/lib/contacts.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/contacts.tcl,v
diff -u -r1.76 -r1.77
--- openacs-4/packages/contacts/lib/contacts.tcl	9 May 2018 15:33:30 -0000	1.76
+++ openacs-4/packages/contacts/lib/contacts.tcl	12 Aug 2018 12:22:48 -0000	1.77
@@ -337,7 +337,7 @@
 		 ] 
 }
 
-set row_list [concat $row_list $last_modified_rows]
+lappend row_list {*}$last_modified_rows
 
 if { [exists_and_not_null search_id] } {
     # We get all the default values for that are mapped to this search_id
Index: openacs-4/packages/contacts/lib/groups.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/groups.adp,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/contacts/lib/groups.adp	28 Apr 2006 10:14:45 -0000	1.17
+++ openacs-4/packages/contacts/lib/groups.adp	12 Aug 2018 12:22:48 -0000	1.18
@@ -1,32 +1,32 @@
-<if @hide_form_p@ false>
+<if @hide_form_p;literal@ false>
 <if @no_more_available_p@ nil>
 <formtemplate id="add_to_group" style="../../../contacts/resources/forms/inline"></formtemplate>
 </if>
 <else>
 <p>#contacts.lt_You_cannot_add_this_c#</p>
 </else>
-<h3 class="contact-title"><if @hide_form_p@ true><a href="./groups"></if>#contacts.Groups#<if @hide_form_p@ true></a></if></h3>
+<h3 class="contact-title"><if @hide_form_p;literal@ true><a href="./groups"></if>#contacts.Groups#<if @hide_form_p;literal@ true></a></if></h3>
 </if>
 <if @groups:rowcount@ gt 0>
 <dl class="groups">
 <multiple name="groups">
-   <if @groups.sub_p@><dd class="subgroup"></if><else><dt class="primarygroup"></else>
+   <if @groups.sub_p;literal@ true><dd class="subgroup"></if><else><dt class="primarygroup"></else>
    @groups.group;noquote@ <a href="@groups.remove_url@"><img src="/resources/acs-subsite/Delete16.gif" width="16" height="16" border="0" alt="#contacts.Delete_from# @groups.group;noquote@"></a> - <font size="-2">[@groups.creation_date@]</font>
-   <if @groups.sub_p@></dd></if><else><dt></else>
+   <if @groups.sub_p;literal@ true></dd></if><else><dt></else>
 </multiple>
-<if @user_p@ eq 1><dt class="primarygroup">#contacts.Users#</dt></if>
+<if @user_p;literal@ true><dt class="primarygroup">#contacts.Users#</dt></if>
 </dl>
 </if>
 <else>
-<if @hide_form_p@ true><h3 class="contact-title"><a href="./groups">#contacts.Groups#</a></h3></if>
-<if @user_p@ eq 1>
+<if @hide_form_p;literal@ true><h3 class="contact-title"><a href="./groups">#contacts.Groups#</a></h3></if>
+<if @user_p;literal@ true>
 <dl class="groups">
   <dt class="primarygroup">#contacts.Users#</dt>
 </dl>
 </if>
 </else>
 
-<if @hide_form_p@ false and @delete_p@>
+<if @hide_form_p@ false and @delete_p;literal@ true>
 <h3>#contacts.Other_Options#</h3>
 <ul class="action-links">
   <li><a href="@remove_url@">#contacts.lt_Delete_this_contact#</a>
Index: openacs-4/packages/contacts/lib/lists-include.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/lists-include.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/lib/lists-include.adp	26 Jun 2006 06:36:51 -0000	1.1
+++ openacs-4/packages/contacts/lib/lists-include.adp	12 Aug 2018 12:22:48 -0000	1.2
@@ -1,12 +1,12 @@
-<if @lists:rowcount@ gt 0 or @form_p@>
+<if @lists:rowcount@ gt 0 or @form_p;literal@ true>
 
 <h3>#contacts.Lists#</h3>
 
 <ul>
 <multiple name=lists>
-  <li><a href="@lists.list_url@">@lists.title@</a><if @lists.owner_p@> <a href="@lists.delete_url@"><img src="/resources/acs-subsite/Delete16.gif" height="16" width="16" alt="#contacts.Delete#" border="0" /></a></if></li>
+  <li><a href="@lists.list_url@">@lists.title@</a><if @lists.owner_p;literal@ true> <a href="@lists.delete_url@"><img src="/resources/acs-subsite/Delete16.gif" height="16" width="16" alt="#contacts.Delete#" border="0" /></a></if></li>
 </multiple>
-<if @form_p@>
+<if @form_p;literal@ true>
  <li><formtemplate id="add_list_member" style="../../../contacts/resources/forms/inline"></formtemplate></li>
 </if>
 </ul>
Index: openacs-4/packages/contacts/lib/oo_mailing.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/oo_mailing.tcl,v
diff -u -r1.22 -r1.23
--- openacs-4/packages/contacts/lib/oo_mailing.tcl	9 May 2018 15:33:30 -0000	1.22
+++ openacs-4/packages/contacts/lib/oo_mailing.tcl	12 Aug 2018 12:22:48 -0000	1.23
@@ -63,7 +63,7 @@
 	{banner:text(hidden) {value ""}}
     }
 } else {
-    set banner_options [concat [list ""] $banner_options]
+    set banner_options [linsert $banner_options 0 [list ""]]
     append form_elements {
 	{banner:text(select),optional
 	    {label "[_ contacts.Banner]"} 
Index: openacs-4/packages/contacts/lib/sharing.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/sharing.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/lib/sharing.adp	26 Jun 2006 06:36:51 -0000	1.1
+++ openacs-4/packages/contacts/lib/sharing.adp	12 Aug 2018 12:22:48 -0000	1.2
@@ -5,9 +5,9 @@
 
 
 
-<h2>#contacts.Sharing#: <if @public_p@>#contacts.Public#</if><else>#contacts.Owners_Only#</else></h2>
+<h2>#contacts.Sharing#: <if @public_p;literal@ true>#contacts.Public#</if><else>#contacts.Owners_Only#</else></h2>
 
-<if @admin_p@>
+<if @admin_p;literal@ true>
 <ul>
 <li><a href="@public_url@">#contacts.Change_Sharing#</a></li>
 </ul>
Index: openacs-4/packages/contacts/resources/forms/file-upload.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/resources/forms/file-upload.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/resources/forms/file-upload.adp	27 May 2005 00:18:58 -0000	1.1
+++ openacs-4/packages/contacts/resources/forms/file-upload.adp	12 Aug 2018 12:22:48 -0000	1.2
@@ -43,7 +43,7 @@
                   </else>
               </noparse>
                     @elements.label;noquote@
-                <if @form_properties.show_required_p@ true>
+                <if @form_properties.show_required_p;literal@ true>
                 <if @elements.optional@ nil and @elements.mode@ ne "display" and @elements.widget@ ne "inform" and @elements.widget@ ne "select"><span class="form-required-mark">*</span></if>
                 </if>
               </span>
Index: openacs-4/packages/contacts/resources/forms/inline.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/resources/forms/inline.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/contacts/resources/forms/inline.adp	18 Apr 2006 07:07:02 -0000	1.2
+++ openacs-4/packages/contacts/resources/forms/inline.adp	12 Aug 2018 12:22:48 -0000	1.3
@@ -31,7 +31,7 @@
                   </else>
               </noparse>
                     @elements.label;noquote@
-                <if @form_properties.show_required_p@ true>
+                <if @form_properties.show_required_p;literal@ true>
                 <if @elements.optional@ nil and @elements.mode@ ne "display" and @elements.widget@ ne "inform" and @elements.widget@ ne "select"><span class="form-required-mark">*</span></if>
 
 
Index: openacs-4/packages/contacts/tcl/contact-search-condition-type-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contact-search-condition-type-procs.tcl,v
diff -u -r1.41 -r1.42
--- openacs-4/packages/contacts/tcl/contact-search-condition-type-procs.tcl	5 Apr 2018 14:44:09 -0000	1.41
+++ openacs-4/packages/contacts/tcl/contact-search-condition-type-procs.tcl	12 Aug 2018 12:22:48 -0000	1.42
@@ -312,7 +312,7 @@
 
                 if { $operand != "set" && $operand != "not_set" } {
                     # there could be variable elements so we add them here
-                    set form_elements [concat $form_elements $var_elements]
+                    lappend form_elements {*}$var_elements
                 }
             }
             return $form_elements
Index: openacs-4/packages/contacts/tcl/contacts-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/tcl/contacts-procs.tcl,v
diff -u -r1.121 -r1.122
--- openacs-4/packages/contacts/tcl/contacts-procs.tcl	6 Jun 2018 23:02:01 -0000	1.121
+++ openacs-4/packages/contacts/tcl/contacts-procs.tcl	12 Aug 2018 12:22:48 -0000	1.122
@@ -150,7 +150,7 @@
 	return
     }
 
-    with_finally -code {
+    ad_try {
 	if {$contacts_package_ids eq ""} {
 	    set contacts_package_ids [apm_package_ids_from_key -package_key "contacts" -mounted]
 	}
@@ -224,7 +224,7 @@
 	    db_dml delete_deleted_users {}
 	}
 	
-    } -finally {
+    } finally {
 	nsv_incr contacts sweeper_p -1
     }
     
Index: openacs-4/packages/contacts/www/contact.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/contact.adp,v
diff -u -r1.43 -r1.44
--- openacs-4/packages/contacts/www/contact.adp	2 Jun 2006 09:18:31 -0000	1.43
+++ openacs-4/packages/contacts/www/contact.adp	12 Aug 2018 12:22:48 -0000	1.44
@@ -7,15 +7,15 @@
     <include src="/packages/contacts/lib/contact-relationships-portlet" party_id="@party_id@" sort_by_date_p="1"/>
   </div>
   <div class="secondary">
-    <if @dotlrn_club_enabled_p@>
+    <if @dotlrn_club_enabled_p;literal@ true>
       <h3 class="contact-title"><a href="@club_url@">#contacts.Visit_Club#</a></h3>
       </if>
     <include
       src="/packages/contacts/lib/groups-portlet"
       party_id="@party_id@"
       hide_form_p="t" />
       <br />
-    <if @tasks_enabled_p@>
+    <if @tasks_enabled_p;literal@ true>
       <include
 	src="/packages/contacts/lib/tasks-tasks-portlet"
 	object_id="@party_id@"
@@ -48,8 +48,8 @@
 	fmt="%x %r">
 	<br />
     </if>
-    <if @projects_enabled_p@>
-	<if @freelancer_p@>
+    <if @projects_enabled_p;literal@ true>
+	<if @freelancer_p;literal@ true>
 		<include src="/packages/contacts/lib/ap-tasks-portlet"
 		    from_party_id="@party_id@"
 		    page="@page@"
@@ -60,7 +60,7 @@
 		/>
         </if>
     </if>
-    <if @projects_enabled_p@>
+    <if @projects_enabled_p;literal@ true>
       <if @project_url@ ne "">
 	  <include
 	    src="/packages/contacts/lib/subprojects-portlet"
@@ -70,7 +70,7 @@
       </if>
     </if>
     <if @object_type@ eq "organization">
-      <if @invoices_enabled_p@>
+      <if @invoices_enabled_p;literal@ true>
 	<include src="/packages/contacts/lib/offers-portlet" 
 		organization_id="@party_id@" 
 		elements="offer_nr title amount_total" 
@@ -92,7 +92,7 @@
 		format=table />
 	<br />
       </if>
-      <if @projects_enabled_p@>
+      <if @projects_enabled_p;literal@ true>
 	<include src="/packages/contacts/lib/contact-complaint-list-portlet" 
 	    customer_id=@party_id@
 	    elements="title supplier state description"
Index: openacs-4/packages/contacts/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/index.adp,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/contacts/www/index.adp	19 Dec 2006 11:02:05 -0000	1.21
+++ openacs-4/packages/contacts/www/index.adp	12 Aug 2018 12:22:48 -0000	1.22
@@ -9,7 +9,7 @@
 <p>
 <formtemplate id="search" style="../../../contacts/resources/forms/inline"></formtemplate></p>
 
-<if @aggregated_p@>
+<if @aggregated_p;literal@ true>
    <include src="../lib/contacts-aggregated" 
 	base_url="@package_url@" 
 	attr_id=@aggregate_attribute_id@ 
Index: openacs-4/packages/contacts/www/message-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/message-ae.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/contacts/www/message-ae.tcl	27 Jun 2007 02:50:51 -0000	1.12
+++ openacs-4/packages/contacts/www/message-ae.tcl	12 Aug 2018 12:22:48 -0000	1.13
@@ -80,7 +80,7 @@
     oo_mailing {
 	set banner_options [util::find_all_files -extension jpg -path "[acs_root_dir][parameter::get_from_package_key -package_key contacts -parameter OOMailingPath]/banner"]
 	if {![string eq $banner_options ""]} {
-	    set banner_options [concat [list ""] $banner_options]
+	    set banner_options [linsert $banner_options 0 [list ""]]
 	    append form_elements {
 		{banner:text(select),optional
 		    {label "[_ contacts.Banner]"} 
@@ -99,7 +99,7 @@
 	}
 
 	if {![string eq $oo_template_options ""]} {
-	    set oo_template_options [concat [list ""] $oo_template_options]
+	    set oo_template_options [linsert $oo_template_options 0 [list ""]]
 	    append form_elements {
 		{oo_template:text(select),optional
 		    {label "[_ contacts.OOTemplate]"} 
Index: openacs-4/packages/contacts/www/message.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/message.adp,v
diff -u -r1.29 -r1.30
--- openacs-4/packages/contacts/www/message.adp	27 Jun 2007 02:52:33 -0000	1.29
+++ openacs-4/packages/contacts/www/message.adp	12 Aug 2018 12:22:49 -0000	1.30
@@ -6,7 +6,7 @@
 </property>
 <property name="focus">comment_add.comment</property>
 
-  <if @message_create_p@ false>
+  <if @message_create_p;literal@ false>
     <formtemplate id="message"></formtemplate>
   </if>
   <else>
Index: openacs-4/packages/contacts/www/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/search.adp,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/contacts/www/search.adp	5 Apr 2006 22:16:09 -0000	1.13
+++ openacs-4/packages/contacts/www/search.adp	12 Aug 2018 12:22:49 -0000	1.14
@@ -2,7 +2,7 @@
 
 <formtemplate id="advanced_search" style="../../../contacts/resources/forms/inline"></formtemplate>
 
-<if @search_exists_p@>
+<if @search_exists_p;literal@ true>
 <br />
 <br />
 <if @add_columns@ not nil or @remove_columns@ not nil>
Index: openacs-4/packages/contacts/www/settings.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/settings.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/contacts/www/settings.tcl	5 Apr 2007 11:37:48 -0000	1.6
+++ openacs-4/packages/contacts/www/settings.tcl	12 Aug 2018 12:22:49 -0000	1.7
@@ -23,7 +23,7 @@
 	default_p {
 	    label ""
 	    display_template {
-		<if @signatures.default_p@>
+		<if @signatures.default_p;literal@ true>
 		Default Signature
 		</if>
 	    }
Index: openacs-4/packages/contacts/www/admin/ext-search-options.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/admin/ext-search-options.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/contacts/www/admin/ext-search-options.adp	20 Feb 2006 22:01:03 -0000	1.6
+++ openacs-4/packages/contacts/www/admin/ext-search-options.adp	12 Aug 2018 12:22:49 -0000	1.7
@@ -12,7 +12,7 @@
 </if>
 
 <br>
-<if @edit_p@ eq "f"> 
+<if @edit_p;literal@ false> 
     <if @search_id@ nil>
        <h3>#contacts.Stored_extended#:</h3>
     <listtemplate name="ext_options"></listtemplate>
Index: openacs-4/packages/contacts/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/admin/index.tcl,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/contacts/www/admin/index.tcl	28 Jun 2007 00:05:03 -0000	1.18
+++ openacs-4/packages/contacts/www/admin/index.tcl	12 Aug 2018 12:22:49 -0000	1.19
@@ -23,7 +23,7 @@
         edit {
 	    label {}
 	    display_template {
-		<if @groups.dotlrn_community_p@ false><a href="@groups.edit_url@"><img src="/resources/acs-subsite/Edit16.gif" height="16" width="16" border= "0" alt="[_ acs-kernel.common_Edit]"></a></if>
+		<if @groups.dotlrn_community_p;literal@ false><a href="@groups.edit_url@"><img src="/resources/acs-subsite/Edit16.gif" height="16" width="16" border= "0" alt="[_ acs-kernel.common_Edit]"></a></if>
 	    }
 	}
         group_name {
@@ -39,7 +39,7 @@
         mapped {
             label {Mapped}
             display_template {
-                <if @groups.mapped_p@>
+                <if @groups.mapped_p;literal@ true>
                   <a href="group-map?action=unmap&group_id=@groups.group_id@"><img src="/resources/acs-subsite/checkboxchecked.gif" border="0" height="13" width="13" alt="[_ contacts.True]"></a>
                 </if>
                 <else>
@@ -50,12 +50,12 @@
         default {
             label {Default}
             display_template {
-                <if @groups.dotlrn_community_p@ false>
-                <if @groups.default_p@>
+                <if @groups.dotlrn_community_p;literal@ false>
+                <if @groups.default_p;literal@ true>
                   <img src="/resources/acs-subsite/checkboxchecked.gif" border="0" height="13" width="13" alt="[_ contacts.True]">
                 </if>
                 <else>
-                  <if @groups.mapped_p@ and @groups.level@ eq 1>
+                  <if @groups.mapped_p;literal@ true and @groups.level@ eq 1>
                   <a href="group-map?action=makedefault&group_id=@groups.group_id@"><img src="/resources/acs-subsite/checkbox.gif" border="0" height="13" width="13" alt="[_ contacts.False]"></a>
                   </if>
                   <else>
@@ -68,7 +68,7 @@
             label {Notifications}
             display_template {
                 <if @groups.dotlrn_community_p@ false and @groups.mapped_p@ and @groups.level@ eq 1>
-                <if @groups.notifications_p@>
+                <if @groups.notifications_p;literal@ true>
                   <a href="group-map?action=notificationsoff&group_id=@groups.group_id@"><img src="/resources/acs-subsite/checkboxchecked.gif" border="0" height="13" width="13" alt="[_ contacts.True]"></a>
                 </if>
                 <else>
@@ -80,8 +80,8 @@
         user_change {
             label {User Change}
             display_template {
-                <if @groups.dotlrn_community_p@ false>
-                <if @groups.user_change_p@>
+                <if @groups.dotlrn_community_p;literal@ false>
+                <if @groups.user_change_p;literal@ true>
                   <a href="group-user-change?action=disallow&group_id=@groups.group_id@"><img src="/resources/acs-subsite/checkboxchecked.gif" border="0" height="13" width="13" alt="[_ contacts.True]"></a>
                 </if>
                 <else>
@@ -92,28 +92,28 @@
         }
         person_form {
             display_template {
-                <if @groups.dotlrn_community_p@ false>
+                <if @groups.dotlrn_community_p;literal@ false>
                 <a href="@groups.ams_person_url@" class="button">[_ contacts.Person_Form]</a>
                 </if>
             }
         }
         org_form {
             display_template {
-                <if @groups.dotlrn_community_p@ false>
+                <if @groups.dotlrn_community_p;literal@ false>
                 <a href="@groups.ams_org_url@" class="button">[_ contacts.Organization_Form]</a>
                 </if>
             }
         }
 	categories {
 	    display_template {
-                <if @groups.dotlrn_community_p@ false>
+                <if @groups.dotlrn_community_p;literal@ false>
 		<a href="@groups.categories_url@" class="button">[_ contacts.Manage_group_categories]</a>
                 </if>
 	    }
 	}
 	actions {
 	    display_template {
-                <if @groups.dotlrn_community_p@ false>
+                <if @groups.dotlrn_community_p;literal@ false>
 		<if @groups.level@ eq 1><a href="permissions?group_id=@groups.group_id@" class="button">[_ contacts.Permissions]</a></if>
                 </if>
                 <else>