Index: openacs-4/packages/acs-lang/www/admin/batch-editor.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/batch-editor.adp,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/acs-lang/www/admin/batch-editor.adp	1 Dec 2017 18:11:42 -0000	1.11
+++ openacs-4/packages/acs-lang/www/admin/batch-editor.adp	13 Jun 2018 07:28:44 -0000	1.12
@@ -50,7 +50,7 @@
         <multiple name="pagination">
           <tr>
             <group column="group">    
-              <if @pagination.selected;literal@ true">
+              <if @pagination.selected;literal@ true>
                 <td class="high"><strong>@pagination.text@</strong>
               </if>
               <else>
Index: openacs-4/packages/notifications/www/subscribers.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/www/subscribers.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/notifications/www/subscribers.adp	27 Oct 2014 16:41:51 -0000	1.2
+++ openacs-4/packages/notifications/www/subscribers.adp	13 Jun 2018 07:28:44 -0000	1.3
@@ -1,7 +1,7 @@
 <master>
 <property name="doc(title)">#notifications.Manage_Notifications#</property>
 
-<if @notice@>
+<if @notice;literal@ ne "">
 <h2>@notice;noquote@</h2>
 </if>
 
Index: openacs-4/packages/xowiki/www/xinha/insert-wlink.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/xinha/insert-wlink.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/xowiki/www/xinha/insert-wlink.adp	7 Aug 2017 23:48:31 -0000	1.4
+++ openacs-4/packages/xowiki/www/xinha/insert-wlink.adp	13 Jun 2018 07:28:44 -0000	1.5
@@ -57,9 +57,9 @@
   <div class="title">#acs-templating.HTMLArea_InsertWikiLink#</div>
   <div style="padding-left:10px;padding-right:10px;">
     <p>#xowiki.select_link_target#</p>
-    <if @back_link@><a href="@back_link@">previous</a></if>
+    <if @back_link;literal@ not nil><a href="@back_link@">previous</a></if>
     @t1;noquote@
-    <if @next_link@><a href="@next_link@">next</a></if>
+    <if @next_link:literal@ not nil><a href="@next_link@">next</a></if>
     </br>
     Label: <input id="label" type="text"/>
   </div>