Index: openacs-4/packages/acs-admin/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/index.adp,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/acs-admin/www/index.adp	7 Aug 2017 23:47:45 -0000	1.16
+++ openacs-4/packages/acs-admin/www/index.adp	17 Jul 2018 18:30:28 -0000	1.17
@@ -6,7 +6,7 @@
 <include src="/packages/acs-admin/lib/site-wide-services"
     nr_subsites="@subsite_number;literal@" >
 
-<if @packages:rowcount@ gt 0>
+<if @packages:rowcount;literal@ gt 0>
   <h3>Site-Wide Package Administration</h3>
 
   <p>Manage application packages with site-wide administration facilities.
Index: openacs-4/packages/acs-admin/www/subsites.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/subsites.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-admin/www/subsites.adp	22 May 2018 16:29:37 -0000	1.4
+++ openacs-4/packages/acs-admin/www/subsites.adp	17 Jul 2018 18:30:28 -0000	1.5
@@ -8,7 +8,7 @@
   <p>Too many subsites to display: @subsite_number@</p>
 </if>
 <else>
-<if @subsites:rowcount@ gt 0>
+<if @subsites:rowcount;literal@ gt 0>
     <listtemplate name="subsites" style="table-2third"></listtemplate>
 </if>
 </else>
Index: openacs-4/packages/acs-admin/www/install/install-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/install/install-2.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-admin/www/install/install-2.adp	22 May 2018 15:59:45 -0000	1.6
+++ openacs-4/packages/acs-admin/www/install/install-2.adp	17 Jul 2018 18:30:28 -0000	1.7
@@ -15,7 +15,7 @@
     below. </p>
  </if>
 
-  <p> This is the <if @install:rowcount@ eq 1>package</if><else>list of packages</else> we are going to install. </p>
+  <p> This is the <if @install:rowcount;literal@ eq 1>package</if><else>list of packages</else> we are going to install. </p>
 
   <p> Please click the link below to begin installation. </p>
 </else>
@@ -24,7 +24,7 @@
 
 <if @continue_url@ not nil>
   <p>
-    <a href="@continue_url@" class="button">Install above <if @install:rowcount@ eq 1>package</if><else>packages</else></a>
+    <a href="@continue_url@" class="button">Install above <if @install:rowcount;literal@ eq 1>package</if><else>packages</else></a>
   </p>
 </if>
 <if @problems_p;literal@ true>
Index: openacs-4/packages/acs-admin/www/install/install.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/install/install.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-admin/www/install/install.adp	7 Aug 2017 23:47:45 -0000	1.5
+++ openacs-4/packages/acs-admin/www/install/install.adp	17 Jul 2018 18:30:28 -0000	1.6
@@ -4,7 +4,7 @@
 
 
 <listfilters name="packages" style="inline-filters"></listfilters>
-<if @packages:rowcount@ eq 0>
+<if @packages:rowcount;literal@ eq 0>
   <if @upgrade_p;literal@ true>
     <p> No packages on your system need upgrading. </p>
   </if>
Index: openacs-4/packages/acs-admin/www/users/complex-search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/complex-search.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/acs-admin/www/users/complex-search.adp	7 Aug 2017 23:47:45 -0000	1.11
+++ openacs-4/packages/acs-admin/www/users/complex-search.adp	17 Jul 2018 18:30:28 -0000	1.12
@@ -2,10 +2,10 @@
 <property name="doc(title)">Complex User Search</property>
 <property name="context">@context;literal@</property>
 
-<if @criteria:rowcount@ eq 0>
+<if @criteria:rowcount;literal@ eq 0>
   all matching users
 </if><else>
-  <if @criteria:rowcount@ eq 1>
+  <if @criteria:rowcount;literal@ eq 1>
     for users matching the criterion:
     <ul>
     <multiple name="criteria">
@@ -25,7 +25,7 @@
 <hr>
 
 
-<if @user_search:rowcount@ eq 0>
+<if @user_search:rowcount;literal@ eq 0>
   <ul>
     <li>No users found.</li>
   </ul>
@@ -41,7 +41,7 @@
   </multiple>
 </ul>
 
-  <if @user_search:rowcount@ gt 30>
+  <if @user_search:rowcount;literal@ gt 30>
 
     <if @only_authorized_p;literal@ false>
       <p>
Index: openacs-4/packages/acs-admin/www/users/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/search.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-admin/www/users/search.adp	7 Aug 2017 23:47:45 -0000	1.10
+++ openacs-4/packages/acs-admin/www/users/search.adp	17 Jul 2018 18:30:28 -0000	1.11
@@ -32,7 +32,7 @@
   </if></li>
 </multiple>
 
-<if @user_search:rowcount@ eq 0>
+<if @user_search:rowcount;literal@ eq 0>
   <li>No users found.
 </if>
 
Index: openacs-4/packages/acs-api-browser/www/deprecated.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/deprecated.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-api-browser/www/deprecated.adp	7 Aug 2017 23:47:46 -0000	1.9
+++ openacs-4/packages/acs-api-browser/www/deprecated.adp	17 Jul 2018 18:30:28 -0000	1.10
@@ -10,6 +10,6 @@
  </multiple>
  </ul>
 
-<if @deprecated:rowcount@ eq 0>
+<if @deprecated:rowcount;literal@ eq 0>
  No deprecated procedures found
  </if>
\ No newline at end of file
Index: openacs-4/packages/acs-api-browser/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/index.adp,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/acs-api-browser/www/index.adp	3 Jul 2015 10:25:40 -0000	1.21
+++ openacs-4/packages/acs-api-browser/www/index.adp	17 Jul 2018 18:30:28 -0000	1.22
@@ -17,7 +17,7 @@
 </multiple>
 </ul>
 
-<if @disabled_packages:rowcount@ gt 0>
+<if @disabled_packages:rowcount;literal@ gt 0>
   <h3>Disabled Packages</h3>
   <ul>
    <multiple name="disabled_packages">
@@ -27,7 +27,7 @@
 </if>
 
 
-<if @uninstalled_packages:rowcount@ gt 0>
+<if @uninstalled_packages:rowcount;literal@ gt 0>
   <h3>Uninstalled Packages</h3>
   <ul>
    <multiple name="uninstalled_packages">
Index: openacs-4/packages/acs-api-browser/www/proc-browse.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/proc-browse.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/acs-api-browser/www/proc-browse.adp	23 May 2018 06:57:54 -0000	1.12
+++ openacs-4/packages/acs-api-browser/www/proc-browse.adp	17 Jul 2018 18:30:28 -0000	1.13
@@ -24,7 +24,7 @@
   </ul>
 </else>
 
-<if @proc_list:rowcount@ eq 0>
+<if @proc_list:rowcount;literal@ eq 0>
 Sorry, no procedures found
 </if>
 <else>
Index: openacs-4/packages/acs-api-browser/www/proc-search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/proc-search.adp,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/acs-api-browser/www/proc-search.adp	7 Aug 2017 23:47:46 -0000	1.16
+++ openacs-4/packages/acs-api-browser/www/proc-search.adp	17 Jul 2018 18:30:28 -0000	1.17
@@ -15,12 +15,12 @@
    </multiple>
 </ul>
 
-<if @results:rowcount@ eq 0>
+<if @results:rowcount;literal@ eq 0>
 No results found
 </if>
 
 
-<if @private_results:rowcount@ gt 0>
+<if @private_results:rowcount;literal@ gt 0>
   <if @show_private_p;literal@ true>
     <p>
       <strong>Show</strong> | <a href="@hide_private_url@">Hide</a> <strong>@private_results:rowcount@ private</strong> procedure matches
@@ -40,7 +40,7 @@
 </if>
 
 
-<if @deprecated_results:rowcount@ gt 0>
+<if @deprecated_results:rowcount;literal@ gt 0>
   <if @show_deprecated_p;literal@ true>
     <p>
       <strong>Show</strong> | <a href="@hide_deprecated_url@">Hide</a> <strong>@deprecated_results:rowcount@ deprecated</strong> procedure matches
Index: openacs-4/packages/acs-authentication/lib/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-authentication/lib/search.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-authentication/lib/search.adp	14 Jul 2015 22:26:55 -0000	1.2
+++ openacs-4/packages/acs-authentication/lib/search.adp	17 Jul 2018 18:30:28 -0000	1.3
@@ -83,7 +83,7 @@
 </div>
 <div id="navbar-body">
 
-<if @authorities:rowcount@ gt 1>
+<if @authorities:rowcount;literal@ gt 1>
 <h2>#acs-authentication.lt_Not_getting_the_results_you_expected#
 <multiple name="authorities">
 <if @authorities.authority_id@ ne @authority_id@>
Index: openacs-4/packages/acs-automated-testing/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/index.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-automated-testing/www/index.adp	1 Dec 2017 17:59:07 -0000	1.9
+++ openacs-4/packages/acs-automated-testing/www/index.adp	17 Jul 2018 18:30:28 -0000	1.10
@@ -2,7 +2,7 @@
   <property name="doc(title)">@page_title;literal@</property>
   <property name="context">@context;literal@</property>
 
-<if @servers:rowcount@ gt 0>
+<if @servers:rowcount;literal@ gt 0>
   <table border="1" cellspacing="0" cellpadding="3">
     <tr>
       <th>Server</th>
Index: openacs-4/packages/acs-automated-testing/www/server.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/server.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-automated-testing/www/server.adp	7 Aug 2017 23:47:46 -0000	1.7
+++ openacs-4/packages/acs-automated-testing/www/server.adp	17 Jul 2018 18:30:28 -0000	1.8
@@ -32,7 +32,7 @@
   </li>
   <li>Test failures
     <if @has_test_report_p;literal@ true>
-      <if @testcase_failures:rowcount@ eq 0>
+      <if @testcase_failures:rowcount;literal@ eq 0>
         <em>none</em>
       </if>
       <else>
Index: openacs-4/packages/acs-automated-testing/www/admin/testcase.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-automated-testing/www/admin/testcase.adp,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/acs-automated-testing/www/admin/testcase.adp	7 Jul 2018 10:35:36 -0000	1.20
+++ openacs-4/packages/acs-automated-testing/www/admin/testcase.adp	17 Jul 2018 18:30:28 -0000	1.21
@@ -86,7 +86,7 @@
       <th>Result</th>
       <th>Notes</th>
     </tr>
-    <if @tests:rowcount@ eq 0>
+    <if @tests:rowcount;literal@ eq 0>
       <tr><td> No results </td></tr>
     </if>
     <else>
Index: openacs-4/packages/acs-content-repository/www/doc/method.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/www/doc/method.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-content-repository/www/doc/method.adp	7 Aug 2017 23:47:47 -0000	1.3
+++ openacs-4/packages/acs-content-repository/www/doc/method.adp	17 Jul 2018 18:30:28 -0000	1.4
@@ -19,7 +19,7 @@
       </if>
       <tr><th align="left" colspan="2">Parameters:</th><tr>
       <tr><td align="left" colspan="2">
-        <if @params:rowcount@ gt 0>
+        <if @params:rowcount;literal@ gt 0>
           <blockquote><table border="0" cellpadding="0" cellspacing="1">
             <multiple name=params>
               <tr><th align="right" valign="top">@params.name@:</th>
Index: openacs-4/packages/acs-developer-support/www/request-info.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/request-info.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/acs-developer-support/www/request-info.adp	15 Sep 2017 07:04:40 -0000	1.10
+++ openacs-4/packages/acs-developer-support/www/request-info.adp	17 Jul 2018 18:30:29 -0000	1.11
@@ -13,12 +13,12 @@
 
 @body;noquote@
 <if @expired_p;literal@ false>
-  <if @dbreqs:rowcount@ gt 0>
+  <if @dbreqs:rowcount;literal@ gt 0>
     <listfilters name="dbreqs" style="inline-filters"></listfilters>
     <listtemplate name="dbreqs"></listtemplate>
   </if>
 
-  <if @profiling:rowcount@ gt 0>
+  <if @profiling:rowcount;literal@ gt 0>
     <h3>Profiling Information</h3>
     <listtemplate name="profiling"></listtemplate>
     <if @page_fragment_cache_p;literal@ true>
Index: openacs-4/packages/acs-developer-support/www/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/search.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-developer-support/www/search.adp	15 Sep 2017 07:04:40 -0000	1.7
+++ openacs-4/packages/acs-developer-support/www/search.adp	17 Jul 2018 18:30:29 -0000	1.8
@@ -11,7 +11,7 @@
     </p>
 
   <if @gone_p;literal@ false> 
-    <if @matches:rowcount@ gt 0>
+    <if @matches:rowcount;literal@ gt 0>
       <multiple name="matches">
         <div style="border-bottom: 1px solid black;"><p>@matches.file_links;noquote@ <strong>@matches.page@</strong> @matches.size@ bytes</p><pre>@matches.excerpt;noquote@</pre></div>
       </multiple>
Index: openacs-4/packages/acs-lang/www/admin/audit-include.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/audit-include.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-lang/www/admin/audit-include.adp	7 Aug 2017 23:47:57 -0000	1.4
+++ openacs-4/packages/acs-lang/www/admin/audit-include.adp	17 Jul 2018 18:30:29 -0000	1.5
@@ -1,4 +1,4 @@
-<if @audit:rowcount@ gt 0>
+<if @audit:rowcount;literal@ gt 0>
   <ul>
     <multiple name="audit">
       <li>
Index: openacs-4/packages/acs-lang/www/admin/message-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-list.adp,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/acs-lang/www/admin/message-list.adp	7 Aug 2017 23:47:57 -0000	1.17
+++ openacs-4/packages/acs-lang/www/admin/message-list.adp	17 Jul 2018 18:30:29 -0000	1.18
@@ -29,7 +29,7 @@
     <li><a href="@new_message_url@">Create new message</a></li>
   </if>
 
-  <if @messages:rowcount@ eq 0>
+  <if @messages:rowcount;literal@ eq 0>
     <em>No messages</em>
   </if>
   <else>
@@ -41,7 +41,7 @@
   </else>
 </ul>
 
-<if @messages:rowcount@ gt 0>
+<if @messages:rowcount;literal@ gt 0>
   <table cellpadding="0" cellspacing="0" border="0">
     <tr>
       <td style="background: #CCCCCC">
Index: openacs-4/packages/acs-lang/www/admin/message-search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-search.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-lang/www/admin/message-search.adp	7 Aug 2017 23:47:57 -0000	1.7
+++ openacs-4/packages/acs-lang/www/admin/message-search.adp	17 Jul 2018 18:30:29 -0000	1.8
@@ -16,7 +16,7 @@
     </ul>
   </if>
    
-  <if @messages:rowcount@ gt 0>        
+  <if @messages:rowcount;literal@ gt 0>        
     <table cellpadding="0" cellspacing="0" border="0">
       <tr>
         <td style="background: #CCCCCC">
Index: openacs-4/packages/acs-reference/www/reference-data-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-reference/www/reference-data-list.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-reference/www/reference-data-list.adp	7 Aug 2017 23:47:57 -0000	1.6
+++ openacs-4/packages/acs-reference/www/reference-data-list.adp	17 Jul 2018 18:30:29 -0000	1.7
@@ -2,7 +2,7 @@
 <property name="context">@context_bar;literal@</property>
 <property name="doc(title)">@title;literal@</property>
 
-<if @data:rowcount@ eq 0>
+<if @data:rowcount;literal@ eq 0>
 <em>You have no reference data in the database right now.</em><p>
 </if>
 
Index: openacs-4/packages/acs-subsite/lib/user-subsites.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/user-subsites.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/lib/user-subsites.adp	7 Aug 2017 23:47:58 -0000	1.2
+++ openacs-4/packages/acs-subsite/lib/user-subsites.adp	17 Jul 2018 18:30:29 -0000	1.3
@@ -1,4 +1,4 @@
-  <if @groups:rowcount@ gt 0>
+  <if @groups:rowcount;literal@ gt 0>
   <h2>#acs-subsite.You_are_in_the_follow#</h2>
   <ul>
     <multiple name="groups">
Index: openacs-4/packages/acs-subsite/www/group-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/group-master.adp,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/acs-subsite/www/group-master.adp	7 Aug 2017 23:47:58 -0000	1.19
+++ openacs-4/packages/acs-subsite/www/group-master.adp	17 Jul 2018 18:30:29 -0000	1.20
@@ -55,7 +55,7 @@
     <div class="block-marker">Begin main content</div>
     <div id="inner-wrapper">
         
-     <if @user_messages:rowcount@ gt 0>
+     <if @user_messages:rowcount;literal@ gt 0>
        <div id="alert-message">
          <multiple name="user_messages">
            <div class="alert">
@@ -95,7 +95,7 @@
      </div>
      <div id="navbar-body">
      <!-- Second level navigation -->
-       <if @subsections:rowcount@ gt 0>
+       <if @subsections:rowcount;literal@ gt 0>
          <div id="subnavbar-div">
            <div id="subnavbar-container">
              <div id="subnavbar">
@@ -135,7 +135,7 @@
          </div>
        </div>
 
-       <if @subsections:rowcount@ gt 0>
+       <if @subsections:rowcount;literal@ gt 0>
          </div>
        </if>
 
Index: openacs-4/packages/acs-subsite/www/admin/attributes/enum-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/enum-add.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/admin/attributes/enum-add.adp	3 Jul 2015 10:25:44 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/admin/attributes/enum-add.adp	17 Jul 2018 18:30:29 -0000	1.7
@@ -7,7 +7,7 @@
 <h3>Current values</h3>
 <ul>
 
-<if @current_values:rowcount@ eq 0>
+<if @current_values:rowcount;literal@ eq 0>
   <li> <em>none</em> </li>
 </if><else>
   <multiple name="current_values">
Index: openacs-4/packages/acs-subsite/www/admin/attributes/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/one.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-subsite/www/admin/attributes/one.adp	7 Aug 2017 23:47:58 -0000	1.8
+++ openacs-4/packages/acs-subsite/www/admin/attributes/one.adp	17 Jul 2018 18:30:29 -0000	1.9
@@ -12,7 +12,7 @@
 <if @attribute.datatype@ eq "enumeration">
   <p><strong>Possible values:</strong>
   <ul>
-  <if @enum_values:rowcount@ eq 0>
+  <if @enum_values:rowcount;literal@ eq 0>
     <li> <em>(none)</em>
   </if>
   <else>
Index: openacs-4/packages/acs-subsite/www/admin/group-types/groups-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/groups-list.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/group-types/groups-list.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/group-types/groups-list.adp	17 Jul 2018 18:30:29 -0000	1.2
@@ -1,4 +1,4 @@
-<if @groups:rowcount@ eq 0>
+<if @groups:rowcount;literal@ eq 0>
   <li>(none)</li>
 </if>
 <else>
Index: openacs-4/packages/acs-subsite/www/admin/group-types/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/index.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/www/admin/group-types/index.adp	7 Aug 2017 23:47:58 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/admin/group-types/index.adp	17 Jul 2018 18:30:29 -0000	1.8
@@ -8,7 +8,7 @@
 
 <ul>
 
-  <if @group_types:rowcount@ eq 0>
+  <if @group_types:rowcount;literal@ eq 0>
     <li>#acs-subsite.none#</li>
   </if>
   <else>
Index: openacs-4/packages/acs-subsite/www/admin/group-types/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/one.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-subsite/www/admin/group-types/one.adp	7 Aug 2017 23:47:58 -0000	1.8
+++ openacs-4/packages/acs-subsite/www/admin/group-types/one.adp	17 Jul 2018 18:30:29 -0000	1.9
@@ -12,7 +12,7 @@
 <h2>#acs-subsite.Groups_of_this_type#</h2>
 
 <blockquote>
-  <if @groups:rowcount@ eq 0>
+  <if @groups:rowcount;literal@ eq 0>
     <p>(#acs-subsite.none#)</p>
   </if>
   <else>
@@ -42,7 +42,7 @@
     </else>
   </multiple>
 
-  <if @attributes:rowcount@ eq 0>
+  <if @attributes:rowcount;literal@ eq 0>
     <li>#acs-subsite.none#</li>
   </if>
 </ul>
@@ -62,7 +62,7 @@
 
 <ul>
 
-  <if @allowed_relations:rowcount@ eq 0>
+  <if @allowed_relations:rowcount;literal@ eq 0>
     <li>#acs-subsite.none#</li>
   </if>
   <else>
Index: openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add.adp	7 Aug 2017 23:47:58 -0000	1.8
+++ openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add.adp	17 Jul 2018 18:30:29 -0000	1.9
@@ -5,7 +5,7 @@
 
 <h1>#acs-subsite.Add_relationship_for_group__group_type#</h1>
 
-<if @primary_rels:rowcount@ eq "0">
+<if @primary_rels:rowcount;literal@ eq 0">
   <p>There are no other relationship types that you can add. You can <a href="../rel-types/new?return_url=@return_url_enc@">create a new relationship type</a> if you like.</p>
 </if>
 <else>
Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-by-group-type.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/elements-by-group-type.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/www/admin/groups/elements-by-group-type.adp	7 Aug 2017 23:47:58 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/admin/groups/elements-by-group-type.adp	17 Jul 2018 18:30:29 -0000	1.8
@@ -1,4 +1,4 @@
-<if @group_types:rowcount@ eq 0>
+<if @group_types:rowcount;literal@ eq 0>
   <ul>
   <li>#acs-subsite.none#</li>
   </ul>
Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-by-rel-type.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/elements-by-rel-type.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-subsite/www/admin/groups/elements-by-rel-type.adp	7 Aug 2017 23:47:58 -0000	1.9
+++ openacs-4/packages/acs-subsite/www/admin/groups/elements-by-rel-type.adp	17 Jul 2018 18:30:29 -0000	1.10
@@ -1,6 +1,6 @@
 <ol>
 
-<if @rels:rowcount@ eq 0>
+<if @rels:rowcount;literal@ eq 0>
   <li>There are no allowable relationship types for this group</li>
 </if>
 
Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.adp	7 Aug 2017 23:47:58 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.adp	17 Jul 2018 18:30:29 -0000	1.5
@@ -16,7 +16,7 @@
 </if>
 </if>
 
-<if @rels:rowcount@ eq 0>
+<if @rels:rowcount;literal@ eq 0>
 <ul>
   <li>(none)</li>
 </ul>
Index: openacs-4/packages/acs-subsite/www/admin/groups/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/one.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/acs-subsite/www/admin/groups/one.adp	7 Aug 2017 23:47:58 -0000	1.12
+++ openacs-4/packages/acs-subsite/www/admin/groups/one.adp	17 Jul 2018 18:30:29 -0000	1.13
@@ -8,7 +8,7 @@
 <h3>Attributes</h3>
 
 <ul>
- <if @attributes:rowcount@ eq "0">
+ <if @attributes:rowcount;literal@ eq 0">
   <li> <em>There are no attributes for groups of this type</em> </li>
  </if>
  <else>
Index: openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add.adp	3 Jul 2015 10:25:45 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add.adp	17 Jul 2018 18:30:29 -0000	1.8
@@ -2,7 +2,7 @@
 <property name="context">@context;literal@</property>
 <property name="doc(title)">Add relation type</property>
 				   
-<if @primary_rels:rowcount@ eq "0">
+<if @primary_rels:rowcount;literal@ eq 0">
   There are no other relationship types that you can add. You can
   <a href="../rel-types/new?return_url=@return_url_enc@">create a new relationship type</a> if you like.
 </if>
Index: openacs-4/packages/acs-subsite/www/admin/parties/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/parties/one.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/www/admin/parties/one.adp	7 Aug 2017 23:47:58 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/admin/parties/one.adp	17 Jul 2018 18:30:29 -0000	1.8
@@ -5,7 +5,7 @@
 <h3>Attributes</h3>
 
 <ul>
- <if @attributes:rowcount@ eq "0">
+ <if @attributes:rowcount;literal@ eq 0">
   <li> <em>There are no attributes for parties of this type</em> </li>
  </if>
  <else>
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/elements-display.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/elements-display.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/elements-display.adp	7 Aug 2017 23:47:58 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/elements-display.adp	17 Jul 2018 18:30:29 -0000	1.5
@@ -1,7 +1,7 @@
 <h4><a href="@package_url@admin/rel-segments/one?segment_id=@segment_id@">@segment_name@</a></h4>
 
 <ul>
-  <if @elements:rowcount@ eq 0>
+  <if @elements:rowcount;literal@ eq 0>
     <li><em>(none)</em></li>
   </if>
   <else>
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/index.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/index.adp	7 Aug 2017 23:47:58 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/index.adp	17 Jul 2018 18:30:29 -0000	1.7
@@ -8,7 +8,7 @@
 
 <ul>
 
-  <if @seg:rowcount@ eq 0>
+  <if @seg:rowcount;literal@ eq 0>
     <li>#acs-subsite.none#</li>
   </if>
   <else>
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/new.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/new.adp	7 Aug 2017 23:47:58 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/new.adp	17 Jul 2018 18:30:29 -0000	1.8
@@ -3,7 +3,7 @@
 <property name="doc(title)">Create relational segment</property>
 <property name="focus">segment_new.segment_name</property>
 
-<if @rel_types:rowcount@ eq 0>
+<if @rel_types:rowcount;literal@ eq 0>
 
   <strong>There are no relationship types for which to create segments</strong>
 
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/one.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/one.adp	7 Aug 2017 23:47:58 -0000	1.9
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/one.adp	17 Jul 2018 18:30:29 -0000	1.10
@@ -14,7 +14,7 @@
 <h4>Constraints on this segment</h4>
 
 <ul>
-  <if @constraints:rowcount@ eq 0>
+  <if @constraints:rowcount;literal@ eq 0>
     <li>(none)</li>
   </if><else>
    <multiple name="constraints">
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index.adp	3 Jul 2015 10:25:47 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index.adp	17 Jul 2018 18:30:29 -0000	1.7
@@ -6,7 +6,7 @@
 
 <ul>
 
-  <if @constraints:rowcount@ eq 0>
+  <if @constraints:rowcount;literal@ eq 0>
     <li>(none)</li>
   </if>
   <else>
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/index.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/admin/rel-types/index.adp	3 Jul 2015 10:25:47 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/index.adp	17 Jul 2018 18:30:29 -0000	1.7
@@ -8,7 +8,7 @@
 
 <ul>
 
-  <if @rel_types:rowcount@ eq 0>
+  <if @rel_types:rowcount;literal@ eq 0>
     <li><em>#acs-subsite.none#</em></li>
   </if>
   <else>
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/one.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-subsite/www/admin/rel-types/one.adp	7 Aug 2017 23:47:58 -0000	1.9
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/one.adp	17 Jul 2018 18:30:29 -0000	1.10
@@ -5,7 +5,7 @@
 <h4>Relations of this type</h4>
 
 <ul>
- <if @rels:rowcount@ eq 0>
+ <if @rels:rowcount;literal@ eq 0>
     <li>(none)</li>
  </if><else>
   <multiple name="rels">
@@ -25,7 +25,7 @@
 <h4>Attributes of this type of relationship</h4>
 
 <ul>
-  <if @attributes:rowcount@ eq 0>
+  <if @attributes:rowcount;literal@ eq 0>
     <li>(none)</li>
   </if><else>
    <multiple name="attributes">
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/rels-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/rels-list.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/rel-types/rels-list.adp	3 Jul 2015 10:25:47 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/rels-list.adp	17 Jul 2018 18:30:29 -0000	1.6
@@ -2,7 +2,7 @@
 <property name="context">@context;literal@</property>
 <property name="doc(title)">All relations of type "@rel_type_pretty_name;noquote@"</property>
 				   
-<if @rels:rowcount@ eq 0>
+<if @rels:rowcount;literal@ eq 0>
  <ul>
    <li>(none)</li>
  </ul>
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/roles/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/roles/index.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/admin/rel-types/roles/index.adp	3 Jul 2015 10:25:47 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/roles/index.adp	17 Jul 2018 18:30:29 -0000	1.7
@@ -3,7 +3,7 @@
 <property name="doc(title)">Roles</property>
 
 <ul>
-  <if @roles:rowcount@ eq 0>
+  <if @roles:rowcount;literal@ eq 0>
     <li> <em>(none)</em>
   </if><else>
   <multiple name="roles">
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/roles/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/roles/one.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/www/admin/rel-types/roles/one.adp	7 Aug 2017 23:47:58 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/roles/one.adp	17 Jul 2018 18:30:29 -0000	1.8
@@ -13,7 +13,7 @@
 <p><strong>Relationship types that use this role:</strong>
 
 <ul>
-  <if @rels:rowcount@ eq 0>
+  <if @rels:rowcount;literal@ eq 0>
     <li> <em>(none)</em>
   </if><else>
   <multiple name="rels">
@@ -25,7 +25,7 @@
 <p><strong>Administration</strong>
 
 <ul>
-  <if @rels:rowcount@ eq 0>
+  <if @rels:rowcount;literal@ eq 0>
     <li> <a href="delete?role=@role_enc@">Delete this role</a>
   </if><else>
     <li> You can only delete roles that are not in use.
Index: openacs-4/packages/acs-subsite/www/admin/relations/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/one.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/acs-subsite/www/admin/relations/one.adp	22 May 2018 15:59:45 -0000	1.9
+++ openacs-4/packages/acs-subsite/www/admin/relations/one.adp	17 Jul 2018 18:30:29 -0000	1.10
@@ -5,7 +5,7 @@
 <h3>Attributes</h3>
 
 <ul>
- <if @attributes:rowcount@ eq "0">
+ <if @attributes:rowcount;literal@ eq 0">
   <li> <em>There are no attributes for relations of this type</em> </li>
  </if>
  <else>
@@ -72,7 +72,7 @@
     <h3>About @rel.object_id_two_name@</h3>
 
     <ul>
-     <if @object_two_attributes:rowcount@ eq "0">
+     <if @object_two_attributes:rowcount;literal@ eq 0">
       <li> <em>There are no attributes for parties of this type</em> </li>
      </if>
      <else>
Index: openacs-4/packages/acs-subsite/www/admin/site-map/mount.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/mount.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-subsite/www/admin/site-map/mount.adp	7 Aug 2017 23:47:58 -0000	1.6
+++ openacs-4/packages/acs-subsite/www/admin/site-map/mount.adp	17 Jul 2018 18:30:29 -0000	1.7
@@ -6,7 +6,7 @@
   Please select one of the following packages to mount on <code><strong>@site_node_url@</strong></code>.
 </p>
 
-<if @unmounted:rowcount@ gt 0>
+<if @unmounted:rowcount;literal@ gt 0>
   <p>
     These package instances are not mounted anywhere else:
   </p>
@@ -18,7 +18,7 @@
   </ul>
 </if>
 
-<if @mounted:rowcount@ gt 0>
+<if @mounted:rowcount;literal@ gt 0>
   <p>
     These instances are already mounted elsewhere. Selecting one of them
     will create an additional location for the same application:
@@ -31,7 +31,7 @@
   </ul>
 </if>
 
-<if @singleton:rowcount@ gt 0>
+<if @singleton:rowcount;literal@ gt 0>
   <p>
     These packages are centralized services and are probably not meant to
     be mounted anywhere:
Index: openacs-4/packages/acs-subsite/www/admin/site-map/unmounted.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/unmounted.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/site-map/unmounted.adp	7 Aug 2017 23:47:58 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/site-map/unmounted.adp	17 Jul 2018 18:30:29 -0000	1.5
@@ -5,7 +5,7 @@
   The following application packages are not mounted anywhere.  You can delete an unmounted package by clicking the "delete" option.
 
   <ul>
-   <if @packages_normal:rowcount@ ne 0>
+   <if @packages_normal:rowcount;literal@ ne 0>
     <multiple name="packages_normal">
      <li>@packages_normal.name@ (@packages_normal.package_key@): [<a href="@packages_normal.instance_delete_url@" id="@packages_normal.delete_id;literal@">delete</a>]</li>
     </multiple>
@@ -18,7 +18,7 @@
   The following services are singleton packages and are usually not meant to be mounted anywhere.  Be careful not to delete a service that is in use as this can potentially break the system.
 
   <ul>
-   <if @packages_singleton:rowcount@ ne 0>
+   <if @packages_singleton:rowcount;literal@ ne 0>
     <multiple name="packages_singleton">
      <li>@packages_singleton.name@  (@packages_singleton.package_key@): [<a href="@packages_singleton.instance_delete_url@" id="@packages_singleton.delete_id;literal@">delete</a>]</li>
     </multiple>
Index: openacs-4/packages/acs-subsite/www/permissions/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/index.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-subsite/www/permissions/index.adp	7 Aug 2017 23:47:59 -0000	1.8
+++ openacs-4/packages/acs-subsite/www/permissions/index.adp	17 Jul 2018 18:30:29 -0000	1.9
@@ -2,7 +2,7 @@
     <property name="doc(title)">#acs-subsite.Permissions#</property>
     <property name="context">@context;literal@</property>
 
-    <if @objects:rowcount@ gt 0> 
+    <if @objects:rowcount;literal@ gt 0> 
       #acs-subsite.You_have_admin_rights_on#
       <ul>
         <multiple name="objects">
Index: openacs-4/packages/acs-subsite/www/permissions/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/one.adp,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/acs-subsite/www/permissions/one.adp	7 Aug 2017 23:47:59 -0000	1.14
+++ openacs-4/packages/acs-subsite/www/permissions/one.adp	17 Jul 2018 18:30:29 -0000	1.15
@@ -3,7 +3,7 @@
   <property name="context">@context;literal@</property>
 
   <h3>#acs-subsite.lt_Inherited_Permissions#</h3>
-  <if @inherited:rowcount@ gt 0>
+  <if @inherited:rowcount;literal@ gt 0>
     <ul>
       <multiple name="inherited">
         <li>@inherited.grantee_name@, @inherited.privilege@</li>
@@ -14,7 +14,7 @@
     <p><em>#acs-subsite.none#</em></p>
   </else>
   <h3>#acs-subsite.Direct_Permissions#</h3>
-  <if @acl:rowcount@ gt 0>
+  <if @acl:rowcount;literal@ gt 0>
     <form method="get" action="revoke">
       @export_form_vars;noquote@
       <multiple name="acl">
@@ -31,15 +31,15 @@
   <else>
     <p><em>#acs-subsite.none#</em></p>
   </else>
-  <if @acl:rowcount@ gt 0>
+  <if @acl:rowcount;literal@ gt 0>
     <div><input type="submit" value="#acs-subsite.Revoke_Checked#"></div>
     </form>
   </if>
   @controls;noquote@
 
   <h3>#acs-subsite.Children#</h3>
   <if @children_p;literal@ true>
-    <if @children:rowcount@ gt 0>
+    <if @children:rowcount;literal@ gt 0>
       <ul>
         <multiple name="children">
           <li><a href="one?object_id=@children.c_object_id@">@children.c_name@</a> @children.c_type@</li>
Index: openacs-4/packages/acs-tcl/lib/actions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/lib/actions.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-tcl/lib/actions.adp	20 Mar 2005 00:47:07 -0000	1.1
+++ openacs-4/packages/acs-tcl/lib/actions.adp	17 Jul 2018 18:30:29 -0000	1.2
@@ -1,4 +1,4 @@
-  <if @actions:rowcount@ gt 0>
+  <if @actions:rowcount;literal@ gt 0>
   <dl>
     <multiple name="actions">
       <if @actions.type@ eq "SECTION">
Index: openacs-4/packages/acs-tcl/lib/complain.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/lib/complain.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-tcl/lib/complain.adp	7 Aug 2017 23:47:59 -0000	1.7
+++ openacs-4/packages/acs-tcl/lib/complain.adp	17 Jul 2018 18:30:29 -0000	1.8
@@ -3,7 +3,7 @@
 
 <p>
   #acs-tcl.We_had#
-  <if @complaints:rowcount@ gt 1>#acs-tcl.some_problems#</if><else>#acs-tcl.a_problem#</else>
+  <if @complaints:rowcount;literal@ gt 1>#acs-tcl.some_problems#</if><else>#acs-tcl.a_problem#</else>
   #acs-tcl.with_your_input#
   <if @context;literal@ ne "">(@context@)</if>
 </p>
@@ -15,7 +15,7 @@
 </ul>
 
 <p>
-  #acs-tcl.lt_Please_back_up_using_# <if @complaints:rowcount@ gt 1>#acs-tcl.errors#</if><else>#acs-tcl.error#</else>#acs-tcl.lt__and_resubmit_your_en#
+  #acs-tcl.lt_Please_back_up_using_# <if @complaints:rowcount;literal@ gt 1>#acs-tcl.errors#</if><else>#acs-tcl.error#</else>#acs-tcl.lt__and_resubmit_your_en#
 </p>
 
 <p>
Index: openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl,v
diff -u -r1.118 -r1.119
--- openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl	7 Jul 2018 10:38:19 -0000	1.118
+++ openacs-4/packages/acs-tcl/tcl/site-nodes-procs.tcl	17 Jul 2018 18:30:29 -0000	1.119
@@ -1536,7 +1536,7 @@
                             #
                             set short_url [site_node::get_url -node_id $ID]
                             set cmd [list ns_urlspace set -key sitenode $short_url* $ID]
-                            ns_log notice "--- get_node_id save in urlspace <$cmd> -> <$ID>"
+                            #ns_log notice "--- get_node_id save in urlspace <$cmd> -> <$ID>"
                             {*}$cmd
                             #ns_log notice "---\n[join [ns_urlspace list] \n]"
                         }
Index: openacs-4/packages/acs-templating/resources/dimensional/dimensional-table-option.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/resources/dimensional/dimensional-table-option.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-templating/resources/dimensional/dimensional-table-option.adp	7 Aug 2017 23:48:01 -0000	1.2
+++ openacs-4/packages/acs-templating/resources/dimensional/dimensional-table-option.adp	17 Jul 2018 18:30:29 -0000	1.3
@@ -1,2 +1,2 @@
 <td>[<multiple name="opt">
-<if @opt.current@ eq 1><strong>@opt.label@</strong></if><else><a href="@opt.href@">@opt.label@</a></else><if @opt:rowcount@ ne @opt.count@> | </if></multiple>]</td>
\ No newline at end of file
+<if @opt.current@ eq 1><strong>@opt.label@</strong></if><else><a href="@opt.href@">@opt.label@</a></else><if @opt:rowcount;literal@ ne @opt.count@> | </if></multiple>]</td>
\ No newline at end of file
Index: openacs-4/packages/acs-templating/resources/dimensionals/dimensional-option.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/resources/dimensionals/dimensional-option.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-templating/resources/dimensionals/dimensional-option.adp	7 Aug 2017 23:48:01 -0000	1.2
+++ openacs-4/packages/acs-templating/resources/dimensionals/dimensional-option.adp	17 Jul 2018 18:30:29 -0000	1.3
@@ -1,2 +1,2 @@
 <td>[<multiple name="opt">
-<if @opt.current@ eq 1><strong>@opt.label@</strong></if><else><a href="@opt.href@">@opt.label@</a></else><if @opt:rowcount@ ne @opt.count@> | </if></multiple>]</td>
\ No newline at end of file
+<if @opt.current@ eq 1><strong>@opt.label@</strong></if><else><a href="@opt.href@">@opt.label@</a></else><if @opt:rowcount;literal@ ne @opt.count@> | </if></multiple>]</td>
\ No newline at end of file
Index: openacs-4/packages/acs-templating/resources/lists/courses.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/resources/lists/courses.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-templating/resources/lists/courses.adp	7 Aug 2017 23:48:01 -0000	1.4
+++ openacs-4/packages/acs-templating/resources/lists/courses.adp	17 Jul 2018 18:30:29 -0000	1.5
@@ -78,7 +78,7 @@
   @list_properties.bulk_action_export_chunk;noquote@
 </if>
 
-<if @actions:rowcount@ gt 0>
+<if @actions:rowcount;literal@ gt 0>
   <tr class="list-button-bar">
     <td colspan="@elements:rowcount@" class="list-button-bar">
       <multiple name="actions">
@@ -263,7 +263,7 @@
 </if>
 
 <noparse><if \@@list_properties.multirow@:rowcount@ gt 0></noparse>
-  <if @bulk_actions:rowcount@ gt 0>
+  <if @bulk_actions:rowcount;literal@ gt 0>
     <tr class="list-button-bar">
       <td colspan="@elements:rowcount@" class="list-button-bar">
         <multiple name="bulk_actions">
Index: openacs-4/packages/acs-templating/resources/lists/list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/resources/lists/list.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-templating/resources/lists/list.adp	7 Aug 2017 23:48:01 -0000	1.8
+++ openacs-4/packages/acs-templating/resources/lists/list.adp	17 Jul 2018 18:30:29 -0000	1.9
@@ -7,7 +7,7 @@
   </if>
   <else>
 </noparse>
-  <if @bulk_actions:rowcount@ gt 0>
+  <if @bulk_actions:rowcount;literal@ gt 0>
   <if @list_properties.bulk_action_method@ not nil>
   <form name="@list_properties.name@" method="@list_properties.bulk_action_method@">
   </if>
@@ -19,7 +19,7 @@
     </noparse>
   </if>
 
-  <if @actions:rowcount@ gt 0>
+  <if @actions:rowcount;literal@ gt 0>
     <div class="list-button-bar">
       <multiple name="actions">
         <span class="list-button-header"><a href="@actions.url@" class="list-button" title="@actions.title@">@actions.label@</a></span>
@@ -43,7 +43,7 @@
       </multiple>
     </noparse>
 
-  <if @bulk_actions:rowcount@ gt 0>
+  <if @bulk_actions:rowcount;literal@ gt 0>
     <div class="list-button-bar">
       <multiple name="bulk_actions">
 	<% template::add_event_listener -id "$list_properties(name)-bulk_action-$bulk_actions(rownum)" -script [subst {
Index: openacs-4/packages/acs-templating/resources/lists/table-2third.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/resources/lists/table-2third.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-templating/resources/lists/table-2third.adp	7 Aug 2017 23:48:01 -0000	1.2
+++ openacs-4/packages/acs-templating/resources/lists/table-2third.adp	17 Jul 2018 18:30:29 -0000	1.3
@@ -79,7 +79,7 @@
 </if>
 
 
-<if @actions:rowcount@ gt 0>
+<if @actions:rowcount;literal@ gt 0>
 <!-- list-button-bar-top div -->
   <div class="list-button-bar-top">
     <ul class="compact">
@@ -239,7 +239,7 @@
 
 
 <noparse><if \@@list_properties.multirow@:rowcount@ gt 0></noparse>
-  <if @bulk_actions:rowcount@ gt 0>
+  <if @bulk_actions:rowcount;literal@ gt 0>
     <!-- list-button-bar-bottom div -->
     <div class="list-button-bar-bottom">
         <multiple name="bulk_actions">
Index: openacs-4/packages/acs-templating/resources/lists/table.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/resources/lists/table.adp,v
diff -u -r1.28 -r1.29
--- openacs-4/packages/acs-templating/resources/lists/table.adp	7 Aug 2017 23:48:01 -0000	1.28
+++ openacs-4/packages/acs-templating/resources/lists/table.adp	17 Jul 2018 18:30:29 -0000	1.29
@@ -79,7 +79,7 @@
 </if>
 
 
-<if @actions:rowcount@ gt 0>
+<if @actions:rowcount;literal@ gt 0>
 <!-- list-button-bar-top div -->
   <div class="list-button-bar-top">
     <ul class="compact">
@@ -239,7 +239,7 @@
 
 
 <noparse><if \@@list_properties.multirow@:rowcount@ gt 0></noparse>
-  <if @bulk_actions:rowcount@ gt 0>
+  <if @bulk_actions:rowcount;literal@ gt 0>
     <!-- list-button-bar-bottom div -->
     <div class="list-button-bar-bottom">
         <multiple name="bulk_actions">
Index: openacs-4/packages/acs-templating/www/doc/demo/multiaccess.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/multiaccess.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-templating/www/doc/demo/multiaccess.adp	7 Aug 2017 23:48:02 -0000	1.3
+++ openacs-4/packages/acs-templating/www/doc/demo/multiaccess.adp	17 Jul 2018 18:30:29 -0000	1.4
@@ -5,7 +5,7 @@
 <body>
 <h1>Sample Users</h1>
 
-  <if @users:rowcount@ eq 0>
+  <if @users:rowcount;literal@ eq 0>
     <p>Sorry, there are no users in the system at this time.</p>
   </if>
     
Index: openacs-4/packages/acs-templating/www/doc/demo/multiple.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/multiple.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-templating/www/doc/demo/multiple.adp	7 Aug 2017 23:48:02 -0000	1.3
+++ openacs-4/packages/acs-templating/www/doc/demo/multiple.adp	17 Jul 2018 18:30:29 -0000	1.4
@@ -4,7 +4,7 @@
 </head>
 <body>
 <h1>Sample Users</h1>
-  <if @users:rowcount@ eq 0>
+  <if @users:rowcount;literal@ eq 0>
     <p>Sorry, there are no users in the system at this time.</p>
   </if>
   <else>
Index: openacs-4/packages/acs-templating/www/doc/exercise/form-sample.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/exercise/form-sample.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-templating/www/doc/exercise/form-sample.adp	7 Aug 2017 23:48:03 -0000	1.5
+++ openacs-4/packages/acs-templating/www/doc/exercise/form-sample.adp	17 Jul 2018 18:30:29 -0000	1.6
@@ -67,7 +67,7 @@
   </tr>
 
 </multiple>
-  <if @address:rowcount@ eq 0>
+  <if @address:rowcount;literal@ eq 0>
     <tr><th align="center" colspan="4"><em>You currently have no entries in your addressbook</em></th></tr>
   </if>
 
Index: openacs-4/packages/acs-templating/www/doc/gen/namespace-template.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/gen/namespace-template.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-templating/www/doc/gen/namespace-template.adp	7 Aug 2017 23:48:03 -0000	1.5
+++ openacs-4/packages/acs-templating/www/doc/gen/namespace-template.adp	17 Jul 2018 18:30:29 -0000	1.6
@@ -12,7 +12,7 @@
 <blockquote>
 @info.overview@
 </blockquote>
-<if @see:rowcount@ gt 0>
+<if @see:rowcount;literal@ gt 0>
 <p>Also see:
 <dl>
   <multiple name=see>
@@ -32,7 +32,7 @@
 <multiple name=public>
   <a href="#@public.name@">@public.name@</a><br>
 </multiple>
-<if @public:rowcount@ eq 0>
+<if @public:rowcount;literal@ eq 0>
 The namespace @info.name@ currently contains no public methods.
 </if>
 </blockquote>
@@ -42,7 +42,7 @@
 <font color=red>*</font> indicates required
 </p>
 
-<if @public:rowcount@ gt 0>
+<if @public:rowcount;literal@ gt 0>
 <strong>Public Methods:</strong><br>
 </if>
 
@@ -53,7 +53,7 @@
 
 <p>
 
-<if @private:rowcount@ gt 0>
+<if @private:rowcount;literal@ gt 0>
 <strong>Private Methods</strong>:<br>
 </if>
 <multiple name=private>
Index: openacs-4/packages/acs-templating/www/doc/gen/proc-template.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/gen/proc-template.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-templating/www/doc/gen/proc-template.adp	7 Aug 2017 23:48:03 -0000	1.3
+++ openacs-4/packages/acs-templating/www/doc/gen/proc-template.adp	17 Jul 2018 18:30:29 -0000	1.4
@@ -8,7 +8,7 @@
 @info.description@
 </blockquote>
 <dl>
-<if @params:rowcount@ gt 0>
+<if @params:rowcount;literal@ gt 0>
   <strong>Parameters:</strong>
   <table>
   <multiple name=params>
@@ -31,7 +31,7 @@
   <dd>
   @info.return@
 </if>
-<if @options:rowcount@ gt 0>
+<if @options:rowcount;literal@ gt 0>
   <dt><strong>Options:</strong>
   <table>
   <multiple name=options>
@@ -44,7 +44,7 @@
   </multiple>
   </table>
 </if>
-<if @see:rowcount@ gt 0>
+<if @see:rowcount;literal@ gt 0>
   <dt><strong>See Also:</strong>
   <multiple name=see>
     <dd>@see.type@ - <group column=type><a href="@see.url@">@see.name@</a></br></group>
Index: openacs-4/packages/dotlrn-forums/www/user.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-forums/www/user.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/dotlrn-forums/www/user.adp	7 Aug 2017 23:48:10 -0000	1.6
+++ openacs-4/packages/dotlrn-forums/www/user.adp	17 Jul 2018 18:38:33 -0000	1.7
@@ -36,7 +36,7 @@
       <th align="center" width="20%">#dotlrn-forums.Posted#</th>
     </tr>
 
-<if @messages:rowcount@ gt 0>
+<if @messages:rowcount;literal@ gt 0>
 <multiple name="messages">
 
   <if @messages.rownum@ odd>
Index: openacs-4/packages/forums/lib/forums-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/forums-portlet.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/forums/lib/forums-portlet.adp	6 Jun 2018 14:34:18 -0000	1.4
+++ openacs-4/packages/forums/lib/forums-portlet.adp	17 Jul 2018 18:38:33 -0000	1.5
@@ -1,16 +1,16 @@
-<if @hot_topics:rowcount@ ne 0 and @new_topics:rowcount@ ne 0 or @show_empty_p;literal@ true>
+<if @hot_topics:rowcount;literal@ ne 0 and @new_topics:rowcount@ ne 0 or @show_empty_p;literal@ true>
     <if @class@ eq "portalElement">
         <h3><a href="@base_url@">@title@</a></h3>
 
         <h4>Hot topics</h4>
-        <if @hot_topics:rowcount@ eq 0><p>None</p></if><else>
+        <if @hot_topics:rowcount;literal@ eq 0><p>None</p></if><else>
         <p><multiple name="hot_topics">
           <a href="@hot_topics.url@">@hot_topics.name@</a><br>
         </multiple></p>
         </else>
 
         <h4>New topics</h4>
-        <if @new_topics:rowcount@ eq 0><p>None</p></if><else>
+        <if @new_topics:rowcount;literal@ eq 0><p>None</p></if><else>
         <p><multiple name="new_topics">
           <a href="@new_topics.url@">@new_topics.name@</a><br>
         </multiple></p>
@@ -20,14 +20,14 @@
         <h2><a href="@base_url@">@title@</a></h2>
 
         <h3>Hot Topics</h3>
-        <if @hot_topics:rowcount@ eq 0><p>None</p></if><else>
+        <if @hot_topics:rowcount;literal@ eq 0><p>None</p></if><else>
         <p><multiple name="hot_topics">
           <a href="@hot_topics.url@">@hot_topics.name@</a><br>
         </multiple></p>
         </else>
 
         <h3>New Topics</h3>
-        <if @new_topics:rowcount@ eq 0><p>None</p></if><else>
+        <if @new_topics:rowcount;literal@ eq 0><p>None</p></if><else>
         <p><multiple name="new_topics">
           <a href="@new_topics.url@">@new_topics.name@</a><br>
         </multiple></p>
Index: openacs-4/packages/forums/lib/forums/forums-history-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/forums/forums-history-chunk.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/forums/lib/forums/forums-history-chunk.adp	7 Aug 2017 23:48:11 -0000	1.4
+++ openacs-4/packages/forums/lib/forums/forums-history-chunk.adp	17 Jul 2018 18:38:33 -0000	1.5
@@ -3,7 +3,7 @@
 </p>
 
 
-<if @persons:rowcount@ gt 0>
+<if @persons:rowcount;literal@ gt 0>
     <listtemplate name="persons"></listtemplate>
 </if>
 <else>
Index: openacs-4/packages/forums/lib/message/choose-forum-move.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/choose-forum-move.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/forums/lib/message/choose-forum-move.adp	3 Jul 2015 10:47:32 -0000	1.4
+++ openacs-4/packages/forums/lib/message/choose-forum-move.adp	17 Jul 2018 18:38:33 -0000	1.5
@@ -6,7 +6,7 @@
 <form name="input" action="move"  method="get">
 <div><input type="hidden" name="message_id" value="@message_id@"></div>
 <div><input type="hidden" name="confirm_p" value="@confirm_p@"></div>
-<if @forums:rowcount@ eq 0>
+<if @forums:rowcount;literal@ eq 0>
   <p>#forums.Sorry_you_can_not_move_this_thread_There_are_no_other_forums#
 </if>
 <else>
Index: openacs-4/packages/forums/lib/message/choose-message-move.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/choose-message-move.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/forums/lib/message/choose-message-move.adp	3 Jul 2015 10:47:32 -0000	1.4
+++ openacs-4/packages/forums/lib/message/choose-message-move.adp	17 Jul 2018 18:38:33 -0000	1.5
@@ -6,7 +6,7 @@
 <form name="input" action="move-thread" method="get">
 <div><input type="hidden" name="msg_id" value="@msg_id@"></div>
 <div><input type="hidden" name="confirm_p" value="@confirm_p@"></div>
-<if @messages:rowcount@ eq 0 >
+<if @messages:rowcount;literal@ eq 0 >
     <p>#forums.Sorry_you_can_not_move_this_message_There_are_no_other_threads#</p>    
 </if>
 <else>
Index: openacs-4/packages/forums/lib/message/choose-thread-move.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/choose-thread-move.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/forums/lib/message/choose-thread-move.adp	3 Jul 2015 10:47:32 -0000	1.4
+++ openacs-4/packages/forums/lib/message/choose-thread-move.adp	17 Jul 2018 18:38:33 -0000	1.5
@@ -6,7 +6,7 @@
 <form name="input" action="move-thread-thread" method="get">
 <div><input type="hidden" name="msg_id" value="@msg_id@"></div>
 <div><input type="hidden" name="confirm_p" value="@confirm_p@"></div>
-<if @messages:rowcount@ eq 0>
+<if @messages:rowcount;literal@ eq 0>
     <p>#forums.Sorry_you_can_not_move_this_thread_There_are_no_more_threads#</p>
 </if>
 <else>
Index: openacs-4/packages/forums/lib/message/choose_forum_move.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/choose_forum_move.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/forums/lib/message/choose_forum_move.adp	3 Jul 2015 10:47:33 -0000	1.5
+++ openacs-4/packages/forums/lib/message/choose_forum_move.adp	17 Jul 2018 18:38:33 -0000	1.6
@@ -6,7 +6,7 @@
 <form name="input" action="move"  method="get">
 <input type="hidden" name="message_id" value="@message_id@">
 <input type="hidden" name="confirm_p" value="@confirm_p@">
-<if @forums:rowcount@ eq 0>
+<if @forums:rowcount;literal@ eq 0>
   <p>#forums.Sorry_you_can_not_move_this_thread_There_are_no_other_forums#
 </if>
 <else>
Index: openacs-4/packages/forums/lib/message/choose_message_move.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/choose_message_move.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/forums/lib/message/choose_message_move.adp	3 Jul 2015 10:47:33 -0000	1.5
+++ openacs-4/packages/forums/lib/message/choose_message_move.adp	17 Jul 2018 18:38:33 -0000	1.6
@@ -6,7 +6,7 @@
 <form name="input" action="move-thread" method="get">
 <input type="hidden" name="msg_id" value="@msg_id@">
 <input type="hidden" name="confirm_p" value="@confirm_p@">
-<if @messages:rowcount@ eq 0 >
+<if @messages:rowcount;literal@ eq 0 >
     <p>#forums.Sorry_you_can_not_move_this_message_There_are_no_other_threads#</p>    
 </if>
 <else>
Index: openacs-4/packages/forums/lib/message/choose_thread_move.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/choose_thread_move.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/forums/lib/message/choose_thread_move.adp	3 Jul 2015 10:47:33 -0000	1.5
+++ openacs-4/packages/forums/lib/message/choose_thread_move.adp	17 Jul 2018 18:38:33 -0000	1.6
@@ -6,7 +6,7 @@
 <form name="input" action="move-thread-thread" method="get">
 <input type="hidden" name="msg_id" value="@msg_id@">
 <input type="hidden" name="confirm_p" value="@confirm_p@">
-<if @messages:rowcount@ eq 0>
+<if @messages:rowcount;literal@ eq 0>
     #forums.Sorry_you_can_not_move_this_thread_There_are_no_more_threads#
 </if>
 <else>
Index: openacs-4/packages/forums/lib/message/messages-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/messages-list.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/forums/lib/message/messages-list.adp	26 Jan 2005 00:47:37 -0000	1.1
+++ openacs-4/packages/forums/lib/message/messages-list.adp	17 Jul 2018 18:38:33 -0000	1.2
@@ -1,5 +1,5 @@
 <h2> <a href="@url@">Recent messages</a></h2>
-<if @messages:rowcount@ gt 0>
+<if @messages:rowcount;literal@ gt 0>
 <ul><multiple name="messages">
   <li> <a href="@url@/@messages.link@">@messages.subject@</a> <if @messages.n@ gt 1>[@messages.n@]</if> @messages.posted@</li>
 </multiple></ul>
Index: openacs-4/packages/forums/lib/message/pending-list-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/pending-list-chunk.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/forums/lib/message/pending-list-chunk.adp	7 Aug 2017 23:48:11 -0000	1.2
+++ openacs-4/packages/forums/lib/message/pending-list-chunk.adp	17 Jul 2018 18:38:33 -0000	1.3
@@ -1,5 +1,5 @@
 <ul>
-<if @pending_threads:rowcount@ eq 0>
+<if @pending_threads:rowcount;literal@ eq 0>
 <em>#forums.None#</em>
 </if>
 <else>
Index: openacs-4/packages/forums/lib/message/thread-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/thread-chunk.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/forums/lib/message/thread-chunk.adp	7 Aug 2017 23:48:11 -0000	1.9
+++ openacs-4/packages/forums/lib/message/thread-chunk.adp	17 Jul 2018 18:38:33 -0000	1.10
@@ -6,7 +6,7 @@
     post_p="@permissions.post_p;literal@"
     presentation_type="@forum.presentation_type;literal@"
     &message="message">
-    <if @responses:rowcount@ gt 0>
+    <if @responses:rowcount;literal@ gt 0>
       <multiple name="responses">
         <include src="row"
           rownum="@responses.rownum;literal@"
Index: openacs-4/packages/forums-includelet/lib/forums-includelet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-includelet/lib/forums-includelet.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/forums-includelet/lib/forums-includelet.adp	22 May 2018 17:07:49 -0000	1.2
+++ openacs-4/packages/forums-includelet/lib/forums-includelet.adp	17 Jul 2018 18:38:33 -0000	1.3
@@ -1,4 +1,4 @@
-<if @forums:rowcount@ gt 0>
+<if @forums:rowcount;literal@ gt 0>
   <ul>
     <multiple name="forums">
       @forums.parent_name@