Index: openacs-4/packages/acs-subsite/www/pvt/home.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/home.adp,v
diff -u -r1.27 -r1.28
--- openacs-4/packages/acs-subsite/www/pvt/home.adp	3 Jul 2015 10:25:49 -0000	1.27
+++ openacs-4/packages/acs-subsite/www/pvt/home.adp	3 Jul 2015 11:04:09 -0000	1.28
@@ -2,6 +2,6 @@
   <property name="doc(title)">@page_title;literal@</property>
   <property name="context">@context;literal@</property>
   <property name="focus">user_info.first_names</property>
-  <property name="displayed_object_id">@user_id@</property>
+  <property name="displayed_object_id">@user_id;literal@</property>
 
  <include src="@user_home_template@" user_id="@user_id@"/>
Index: openacs-4/packages/calendar/www/cal-item-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-view.adp,v
diff -u -r1.38 -r1.39
--- openacs-4/packages/calendar/www/cal-item-view.adp	23 Jun 2015 14:35:30 -0000	1.38
+++ openacs-4/packages/calendar/www/cal-item-view.adp	3 Jul 2015 11:04:09 -0000	1.39
@@ -1,7 +1,7 @@
 <master>
 <property name="doc(title)">#calendar.Calendar_Item#: @cal_item.name;noquote@</property>
 <property name="context">#calendar.Item#</property>
-<property name="displayed_object_id">@cal_item_id@</property>
+<property name="displayed_object_id">@cal_item_id;literal@</property>
 
 
 
Index: openacs-4/packages/calendar/www/calendar-item-types.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/calendar-item-types.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/calendar/www/calendar-item-types.adp	10 Oct 2009 22:38:09 -0000	1.10
+++ openacs-4/packages/calendar/www/calendar-item-types.adp	3 Jul 2015 11:04:09 -0000	1.11
@@ -1,6 +1,6 @@
 <master>
 <property name="&doc">doc</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <h1>#calendar.Manage_Item_Types#</h1>
 
Index: openacs-4/packages/calendar/www/admin/calendar-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/admin/calendar-edit.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/calendar/www/admin/calendar-edit.adp	27 Oct 2014 16:41:09 -0000	1.5
+++ openacs-4/packages/calendar/www/admin/calendar-edit.adp	3 Jul 2015 11:04:09 -0000	1.6
@@ -1,6 +1,6 @@
 <master>
-  <property name="doc(title)">@page_title;noquote@</property>
-  <property name="context">@context;noquote@</property>
+  <property name="doc(title)">@page_title;literal@</property>
+  <property name="context">@context;literal@</property>
   <property name="focus">calendar.calendar_name</property>
 
 <formtemplate id="calendar"></formtemplate>
Index: openacs-4/packages/calendar/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/admin/index.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/calendar/www/admin/index.adp	27 Oct 2014 16:41:09 -0000	1.12
+++ openacs-4/packages/calendar/www/admin/index.adp	3 Jul 2015 11:04:09 -0000	1.13
@@ -1,6 +1,6 @@
 <master>
-  <property name="doc(title)">@page_title;noquote@</property>
-  <property name="context">@context;noquote@</property>
+  <property name="doc(title)">@page_title;literal@</property>
+  <property name="context">@context;literal@</property>
 
 
 <listtemplate name="calendars"></listtemplate>
Index: openacs-4/packages/calendar/www/admin/permissions-user-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/admin/permissions-user-add.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/calendar/www/admin/permissions-user-add.adp	27 Oct 2014 16:41:09 -0000	1.3
+++ openacs-4/packages/calendar/www/admin/permissions-user-add.adp	3 Jul 2015 11:04:09 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-  <property name="doc(title)">@page_title@</property>
-  <property name="context">@context@</property>
+  <property name="doc(title)">@page_title;literal@</property>
+  <property name="context">@context;literal@</property>
 
 <include src="/packages/acs-subsite/www/permissions/perm-user-add-include">
Index: openacs-4/packages/calendar/www/admin/permissions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/admin/permissions.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/calendar/www/admin/permissions.adp	27 Oct 2014 16:41:09 -0000	1.3
+++ openacs-4/packages/calendar/www/admin/permissions.adp	3 Jul 2015 11:04:09 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-  <property name="doc(title)">@page_title@</property>
-  <property name="context">@context@</property>
+  <property name="doc(title)">@page_title;literal@</property>
+  <property name="context">@context;literal@</property>
 
 <include src="/packages/acs-subsite/www/permissions/perm-include" object_id="@object_id@" user_add_url="permissions-user-add">
Index: openacs-4/packages/new-portal/www/render-element.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/render-element.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/new-portal/www/render-element.adp	20 Jun 2003 15:52:43 -0000	1.7
+++ openacs-4/packages/new-portal/www/render-element.adp	3 Jul 2015 11:04:09 -0000	1.8
@@ -19,15 +19,15 @@
 %>
 
 <master src="@element.filename@">
-<property name="name">@element.name@</property>
-<property name="dir">@element.resource_dir@</property>
-<property name="element_id">@element.element_id@</property>
-<property name="link">@element.link@</property>
-<property name="shadeable_p">@element.shadeable_p@</property>
-<property name="shaded_p">@element.shaded_p@</property>
-<property name="hideable_p">@element.hideable_p@</property>
-<property name="user_editable_p">@element.user_editable_p@</property>
-<property name="link_hideable_p">@element.link_hideable_p@</property>
-<property name="hide_links_p">@hide_links_p@</property>
+<property name="name">@element.name;literal@</property>
+<property name="dir">@element.resource_dir;literal@</property>
+<property name="element_id">@element.element_id;literal@</property>
+<property name="link">@element.link;literal@</property>
+<property name="shadeable_p">@element.shadeable_p;literal@</property>
+<property name="shaded_p">@element.shaded_p;literal@</property>
+<property name="hideable_p">@element.hideable_p;literal@</property>
+<property name="user_editable_p">@element.user_editable_p;literal@</property>
+<property name="link_hideable_p">@element.link_hideable_p;literal@</property>
+<property name="hide_links_p">@hide_links_p;literal@</property>
 
 @element.content;noquote@
Index: openacs-4/packages/new-portal/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/admin/index.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/new-portal/www/admin/index.adp	17 Jun 2015 07:28:07 -0000	1.8
+++ openacs-4/packages/new-portal/www/admin/index.adp	3 Jul 2015 11:04:09 -0000	1.9
@@ -19,7 +19,7 @@
 %>
 
 <master>
-<property name="title">Welcome to Portals</property>
+<property name="doc(title)">Welcome to Portals</property>
 
 <P>
 
Index: openacs-4/packages/new-portal/www/render_styles/all_in_one/render-element.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/render_styles/all_in_one/render-element.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/new-portal/www/render_styles/all_in_one/render-element.adp	15 May 2007 20:14:48 -0000	1.9
+++ openacs-4/packages/new-portal/www/render_styles/all_in_one/render-element.adp	3 Jul 2015 11:04:09 -0000	1.10
@@ -19,16 +19,16 @@
 %>
 
 <master src="@element.filename@">
-<property name="name">@element.name@</property>
-<property name="dir">@element.resource_dir@</property>
-<property name="element_id">@element.element_id@</property>
-<property name="link">@element.link@</property>
-<property name="shadeable_p">@element.shadeable_p@</property>
-<property name="shaded_p">@element.shaded_p@</property>
-<property name="hideable_p">@element.hideable_p@</property>
-<property name="user_editable_p">@element.user_editable_p@</property>
-<property name="link_hideable_p">@element.link_hideable_p@</property>
-<property name="hide_links_p">@hide_links_p@</property>
+<property name="name">@element.name;literal@</property>
+<property name="dir">@element.resource_dir;literal@</property>
+<property name="element_id">@element.element_id;literal@</property>
+<property name="link">@element.link;literal@</property>
+<property name="shadeable_p">@element.shadeable_p;literal@</property>
+<property name="shaded_p">@element.shaded_p;literal@</property>
+<property name="hideable_p">@element.hideable_p;literal@</property>
+<property name="user_editable_p">@element.user_editable_p;literal@</property>
+<property name="link_hideable_p">@element.link_hideable_p;literal@</property>
+<property name="hide_links_p">@hide_links_p;literal@</property>
 
 <h1>@element.name@</h1>
 @element.content;noquote@
Index: openacs-4/packages/new-portal/www/render_styles/individual/render-element.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/render_styles/individual/render-element.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/new-portal/www/render_styles/individual/render-element.adp	15 May 2007 20:14:49 -0000	1.7
+++ openacs-4/packages/new-portal/www/render_styles/individual/render-element.adp	3 Jul 2015 11:04:09 -0000	1.8
@@ -20,16 +20,16 @@
 
 <if @empty_p@ eq 0>
 <master src="@element.filename@">
-<property name="name">@element.name;noquote@</property>
-<property name="dir">@element.resource_dir@</property>
-<property name="element_id">@element.element_id@</property>
-<property name="element_num">@element_num@</property>
-<property name="link">@element.link@</property>
-<property name="shadeable_p">@element.shadeable_p@</property>
-<property name="shaded_p">@element.shaded_p@</property>
-<property name="hideable_p">@element.hideable_p@</property>
-<property name="user_editable_p">@element.user_editable_p@</property>
-<property name="link_hideable_p">@element.link_hideable_p@</property>
-<property name="hide_links_p">@hide_links_p@</property>
+<property name="name">@element.name;literal@</property>
+<property name="dir">@element.resource_dir;literal@</property>
+<property name="element_id">@element.element_id;literal@</property>
+<property name="element_num">@element_num;literal@</property>
+<property name="link">@element.link;literal@</property>
+<property name="shadeable_p">@element.shadeable_p;literal@</property>
+<property name="shaded_p">@element.shaded_p;literal@</property>
+<property name="hideable_p">@element.hideable_p;literal@</property>
+<property name="user_editable_p">@element.user_editable_p;literal@</property>
+<property name="link_hideable_p">@element.link_hideable_p;literal@</property>
+<property name="hide_links_p">@hide_links_p;literal@</property>
 @element.content;noquote@
 </if>
Index: openacs-4/packages/new-portal/www/themes/kelp-theme/site-master-kelp.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/themes/kelp-theme/site-master-kelp.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/new-portal/www/themes/kelp-theme/site-master-kelp.adp	17 Jun 2015 07:28:08 -0000	1.4
+++ openacs-4/packages/new-portal/www/themes/kelp-theme/site-master-kelp.adp	3 Jul 2015 11:04:09 -0000	1.5
@@ -1,12 +1,12 @@
 <master src="/www/blank-master">
   <if @title@ not nil>
-    <property name="title">@title;noquote@</property>
+    <property name="doc(title)">@title;literal@</property>
   </if>
   <if @signatory@ not nil>
-    <property name="signatory">@signatory;noquote@</property>
+    <property name="signatory">@signatory;literal@</property>
   </if>
   <if @focus@ not nil>
-    <property name="focus">@focus;noquote@</property>
+    <property name="focus">@focus;literal@</property>
   </if>
 
 
Index: openacs-4/packages/new-portal/www/themes/kelp-theme/dotlrn/dotlrn-master-kelp.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/themes/kelp-theme/dotlrn/dotlrn-master-kelp.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/new-portal/www/themes/kelp-theme/dotlrn/dotlrn-master-kelp.adp	4 Jan 2008 17:54:34 -0000	1.3
+++ openacs-4/packages/new-portal/www/themes/kelp-theme/dotlrn/dotlrn-master-kelp.adp	3 Jul 2015 11:04:09 -0000	1.4
@@ -1,11 +1,11 @@
 <master src="/www/site-master-kelp">
   <if @context@ not nil>
-     <property name="context">@context;noquote@</property>
+     <property name="context">@context;literal@</property>
   </if>
-  <else><if @context_bar@ not nil><property name="context_bar">@context_bar;noquote@</property></if></else>
-  <if @focus@ not nil><property name="focus">@focus;noquote@</property></if>
-  <if @doc_type@ not nil><property name="doc_type">@doc_type;noquote@</property></if>
-  <if @title@ not nil><property name="title">@title;noquote@</property></if>
+  <else><if @context_bar@ not nil><property name="context_bar">@context_bar;literal@</property></if></else>
+  <if @focus@ not nil><property name="focus">@focus;literal@</property></if>
+  <if @doc_type@ not nil><property name="doc_type">@doc_type;literal@</property></if>
+  <if @title@ not nil><property name="doc(title)">@title;literal@</property></if>
 
 
 
Index: openacs-4/packages/news/lib/item.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/lib/item.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/news/lib/item.adp	12 Sep 2013 20:37:41 -0000	1.3
+++ openacs-4/packages/news/lib/item.adp	3 Jul 2015 11:04:08 -0000	1.4
@@ -1,7 +1,7 @@
 <master>
 
-  <property name="context">@context;noquote@</property>
-  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;literal@</property>
+  <property name="doc(title)">@title;literal@</property>
 
 
   <if @item_exist_p@ false>
Index: openacs-4/packages/news/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/index.adp,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/news/www/index.adp	12 Sep 2013 20:37:41 -0000	1.18
+++ openacs-4/packages/news/www/index.adp	3 Jul 2015 11:04:08 -0000	1.19
@@ -1,6 +1,6 @@
 <master>
-  <property name="context">@context;noquote@</property>
-  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;literal@</property>
+  <property name="doc(title)">@title;literal@</property>
 
     <listtemplate name="news"></listtemplate>
 
Index: openacs-4/packages/news/www/item-create-thankyou.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/item-create-thankyou.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/news/www/item-create-thankyou.adp	12 Sep 2013 20:37:41 -0000	1.7
+++ openacs-4/packages/news/www/item-create-thankyou.adp	3 Jul 2015 11:04:08 -0000	1.8
@@ -1,7 +1,7 @@
 <master>
 
-<property name="context">@context;noquote@</property>
-<property name="doc(title)">@title;noquote@</property>
+<property name="context">@context;literal@</property>
+<property name="doc(title)">@title;literal@</property>
 
 <p>
  	#news.Your_news_item# <i><b>@publish_title@</b></i>
Index: openacs-4/packages/news/www/item-create.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/item-create.adp,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/news/www/item-create.adp	12 Sep 2013 20:37:41 -0000	1.13
+++ openacs-4/packages/news/www/item-create.adp	3 Jul 2015 11:04:08 -0000	1.14
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="context">@context;literal@</property>
 <property name="focus">news.publish_title</property>
 
 <h1>@title;noquote@</h1>
Index: openacs-4/packages/news/www/item.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/item.adp,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/news/www/item.adp	27 Oct 2014 16:41:48 -0000	1.18
+++ openacs-4/packages/news/www/item.adp	3 Jul 2015 11:04:08 -0000	1.19
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <h1>@title;noquote@</h1>
 
Index: openacs-4/packages/news/www/preview.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/preview.adp,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/news/www/preview.adp	17 Jun 2015 07:31:34 -0000	1.18
+++ openacs-4/packages/news/www/preview.adp	3 Jul 2015 11:04:08 -0000	1.19
@@ -1,6 +1,6 @@
 <master>
-<property name="context">@context;noquote@</property>
-<property name="doc(title)">@title;noquote@</property>
+<property name="context">@context;literal@</property>
+<property name="doc(title)">@title;literal@</property>
 
 <div style="position: relative;">
 <h1>@title;noquote@</h1>
Index: openacs-4/packages/news/www/admin/approve.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/approve.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/news/www/admin/approve.adp	17 Jun 2015 07:31:34 -0000	1.11
+++ openacs-4/packages/news/www/admin/approve.adp	3 Jul 2015 11:04:08 -0000	1.12
@@ -1,6 +1,6 @@
 <master>
-<property name="context">@context;noquote@</property>
-<property name="doc(title)">@title;noquote@</property>
+<property name="context">@context;literal@</property>
+<property name="doc(title)">@title;literal@</property>
 
 <p>
 <table border="0">
Index: openacs-4/packages/news/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/index.adp,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/news/www/admin/index.adp	17 Jun 2015 07:31:34 -0000	1.18
+++ openacs-4/packages/news/www/admin/index.adp	3 Jul 2015 11:04:09 -0000	1.19
@@ -1,7 +1,7 @@
 <master>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 <p>
-<property name="doc(title)">@title;noquote@</property>
+<property name="doc(title)">@title;literal@</property>
 
 <ul>
   <li><a href="../item-create">#news.Create_a_news_item#</a></li>
Index: openacs-4/packages/news/www/admin/item.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/item.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/news/www/admin/item.adp	12 Sep 2013 20:37:41 -0000	1.9
+++ openacs-4/packages/news/www/admin/item.adp	3 Jul 2015 11:04:09 -0000	1.10
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context;noquote@</property>
-<property name="doc(title)">@title;noquote@</property>
+<property name="context">@context;literal@</property>
+<property name="doc(title)">@title;literal@</property>
 
 <listtemplate name="news_items"></listtemplate>
Index: openacs-4/packages/news/www/admin/process.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/process.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/news/www/admin/process.adp	17 Jun 2015 07:31:34 -0000	1.10
+++ openacs-4/packages/news/www/admin/process.adp	3 Jul 2015 11:04:09 -0000	1.11
@@ -1,6 +1,6 @@
 <master>
-<property name="context">@context;noquote@</property>
-<property name="doc(title)">@title;noquote@</property>
+<property name="context">@context;literal@</property>
+<property name="doc(title)">@title;literal@</property>
 
 <if @halt_p@ not nil and @unapproved:rowcount@ gt 0>
   <h3>#news.Error#</h3>
Index: openacs-4/packages/news/www/admin/revision-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/revision-add.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/news/www/admin/revision-add.adp	12 Sep 2013 20:37:41 -0000	1.12
+++ openacs-4/packages/news/www/admin/revision-add.adp	3 Jul 2015 11:04:09 -0000	1.13
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@title;noquote@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="context">@context;literal@</property>
 
 <h1>@title;noquote@</h1>
 
Index: openacs-4/packages/news/www/admin/revision.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/revision.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/news/www/admin/revision.adp	27 Oct 2014 16:41:49 -0000	1.11
+++ openacs-4/packages/news/www/admin/revision.adp	3 Jul 2015 11:04:09 -0000	1.12
@@ -1,6 +1,6 @@
 <master>
-<property name="context">@context;noquote@</property>
-<property name="doc(title)">@title;noquote@</property>
+<property name="context">@context;literal@</property>
+<property name="doc(title)">@title;literal@</property>
 
 
 
Index: openacs-4/packages/notifications/www/request-change-frequency.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/www/request-change-frequency.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/notifications/www/request-change-frequency.adp	13 Sep 2009 23:54:42 -0000	1.5
+++ openacs-4/packages/notifications/www/request-change-frequency.adp	3 Jul 2015 11:04:08 -0000	1.6
@@ -1,6 +1,6 @@
 <master>
 <property name="&doc">doc</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <h1>#notifications.Change_frequency_of_object_name#</h1>
 
Index: openacs-4/packages/notifications/www/request-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/www/request-new.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/notifications/www/request-new.adp	13 Sep 2009 23:54:42 -0000	1.7
+++ openacs-4/packages/notifications/www/request-new.adp	3 Jul 2015 11:04:08 -0000	1.8
@@ -1,6 +1,6 @@
 <master>
 <property name="&doc">doc</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <h1>@page_title@</h1>
 <formtemplate id="subscribe"></formtemplate>
Index: openacs-4/packages/notifications/www/request-notification.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/www/request-notification.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/notifications/www/request-notification.adp	27 Oct 2014 16:41:51 -0000	1.2
+++ openacs-4/packages/notifications/www/request-notification.adp	3 Jul 2015 11:04:08 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@title@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="context">@context;literal@</property>
 <p>#notifications.Subscribe_to_notification# <b>@pretty_name@</b> #notifications.for_the_object_type# <b>@object_type@</b></p>
 <formtemplate id=notify></formtemplate>
 <listtemplate name="notify_users"></listtemplate>
\ No newline at end of file
Index: openacs-4/packages/notifications/www/request-unsubscribe-notification.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/www/request-unsubscribe-notification.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/notifications/www/request-unsubscribe-notification.adp	27 Oct 2014 16:41:51 -0000	1.2
+++ openacs-4/packages/notifications/www/request-unsubscribe-notification.adp	3 Jul 2015 11:04:08 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
-<property name="doc(title)">@title@</property>
-<property name="context">@context;noquote@</property>
+<property name="doc(title)">@title;literal@</property>
+<property name="context">@context;literal@</property>
 <p>#notifications.Unsubscribe_of_notification# <b>@pretty_name@</b></p>
 <listtemplate name="notify_users"></listtemplate>
 
Index: openacs-4/packages/openacs-default-theme/lib/plain-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-default-theme/lib/plain-master.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/openacs-default-theme/lib/plain-master.adp	1 Jun 2008 19:19:26 -0000	1.2
+++ openacs-4/packages/openacs-default-theme/lib/plain-master.adp	3 Jul 2015 11:04:08 -0000	1.3
@@ -1,9 +1,9 @@
 <master src="/www/blank-master">
 <if @doc@ defined><property name="&doc">doc</property></if>
 <if @body@ defined><property name="&body">body</property></if>
-<if @head@ not nil><property name="head">@head;noquote@</property></if>
-<if @focus@ not nil><property name="focus">@focus;noquote@</property></if>
-<property name="skip_link">@skip_link;noquote@</property>
+<if @head@ not nil><property name="head">@head;literal@</property></if>
+<if @focus@ not nil><property name="focus">@focus;literal@</property></if>
+<property name="skip_link">@skip_link;literal@</property>
 
 <div id="wrapper">
     <div id="system-name">
Index: openacs-4/packages/openacs-default-theme/lib/tabbed-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/openacs-default-theme/lib/tabbed-master.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/openacs-default-theme/lib/tabbed-master.adp	8 Jan 2010 21:26:34 -0000	1.2
+++ openacs-4/packages/openacs-default-theme/lib/tabbed-master.adp	3 Jul 2015 11:04:08 -0000	1.3
@@ -1,9 +1,9 @@
 <master src="/packages/openacs-default-theme/lib/plain-master">
 <if @doc@ defined><property name="&doc">doc</property></if>
 <if @body@ defined><property name="&body">body</property></if>
-<if @head@ not nil><property name="head">@head;noquote@</property></if>
-<if @focus@ not nil><property name="focus">@focus;noquote@</property></if>
-<if @context@ not nil><property name="context">@context;noquote@</property></if>
+<if @head@ not nil><property name="head">@head;literal@</property></if>
+<if @focus@ not nil><property name="focus">@focus;literal@</property></if>
+<if @context@ not nil><property name="context">@context;literal@</property></if>
 <property name="&navigation">navigation</property>
 
 <slave>
Index: openacs-4/packages/rss-support/www/delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/www/delete.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/rss-support/www/delete.adp	17 Jun 2015 07:37:21 -0000	1.8
+++ openacs-4/packages/rss-support/www/delete.adp	3 Jul 2015 11:04:08 -0000	1.9
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">Delete Subscription</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 Channel: <if @channel_link@ eq "">@channel_title@</if><else>
 <a href="@channel_link@">@channel_title@</a></else>
Index: openacs-4/packages/rss-support/www/my-subscrs.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/www/my-subscrs.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/rss-support/www/my-subscrs.adp	27 Oct 2014 16:41:54 -0000	1.5
+++ openacs-4/packages/rss-support/www/my-subscrs.adp	3 Jul 2015 11:04:08 -0000	1.6
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">Your Report Generation Subscriptions</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <small><em>Subscriptions created by you.</em></small>
 
Index: openacs-4/packages/rss-support/www/subscr-ae-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/www/subscr-ae-2.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/rss-support/www/subscr-ae-2.adp	27 Oct 2014 16:41:54 -0000	1.4
+++ openacs-4/packages/rss-support/www/subscr-ae-2.adp	3 Jul 2015 11:04:08 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">Subscription Change Complete</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 You may now
 <ul>
Index: openacs-4/packages/rss-support/www/subscr-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/www/subscr-ae.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/rss-support/www/subscr-ae.adp	17 Jun 2015 07:37:21 -0000	1.10
+++ openacs-4/packages/rss-support/www/subscr-ae.adp	3 Jul 2015 11:04:08 -0000	1.11
@@ -1,6 +1,6 @@
 <master>
 <property name="doc(title)">@pretty_action;noquote@ a Subscription</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <form action=subscr-ae-2>
 <table cellpadding="2" cellspacing="2" border="0" bgcolor="e0e0e0">
Index: openacs-4/packages/rss-support/www/admin/subscrs.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/www/admin/subscrs.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/rss-support/www/admin/subscrs.adp	27 Oct 2014 16:41:54 -0000	1.8
+++ openacs-4/packages/rss-support/www/admin/subscrs.adp	3 Jul 2015 11:04:08 -0000	1.9
@@ -1,5 +1,5 @@
 <master>
 <property name="doc(title)">Report Generation Subscriptions</property>
-<property name="context">@context;noquote@</property>
+<property name="context">@context;literal@</property>
 
 <include src="../subscrs-include" enc_url="@enc_url;noquote@" rel_path="..">
\ No newline at end of file
Index: openacs-4/packages/search/www/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/www/search.adp,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/search/www/search.adp	16 Jun 2015 08:46:38 -0000	1.16
+++ openacs-4/packages/search/www/search.adp	3 Jul 2015 11:04:08 -0000	1.17
@@ -1,6 +1,6 @@
 <master>
-<property name="context">@context@</property>
-<property name="doc(title)">@page_title@</property>
+<property name="context">@context;literal@</property>
+<property name="doc(title)">@page_title;literal@</property>
 
 <if @and_queries_notice_p@ eq 1>
   <font color="6f6f6f">
Index: openacs-4/packages/xowiki/www/oacs-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/oacs-view.adp,v
diff -u -r1.71 -r1.72
--- openacs-4/packages/xowiki/www/oacs-view.adp	3 Jul 2015 10:30:42 -0000	1.71
+++ openacs-4/packages/xowiki/www/oacs-view.adp	3 Jul 2015 11:04:07 -0000	1.72
@@ -2,7 +2,7 @@
 <master>
                   <property name="doc(title)">@title;literal@</property>
                   <property name="context">@context;literal@</property>
-                  <if @item_id@ not nil><property name="displayed_object_id">@item_id@</property></if>
+                  <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
                   <property name="&body">property_body</property>
                   <property name="&doc">property_doc</property>
                   <property name="header_stuff">
Index: openacs-4/packages/xowiki/www/oacs-view2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/oacs-view2.adp,v
diff -u -r1.50 -r1.51
--- openacs-4/packages/xowiki/www/oacs-view2.adp	3 Jul 2015 10:30:42 -0000	1.50
+++ openacs-4/packages/xowiki/www/oacs-view2.adp	3 Jul 2015 11:04:08 -0000	1.51
@@ -2,7 +2,7 @@
 <master>
                   <property name="doc(title)">@title;literal@</property>
                   <property name="context">@context;literal@</property>
-                  <if @item_id@ not nil><property name="displayed_object_id">@item_id@</property></if>
+                  <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
                   <property name="&body">property_body</property>
                   <property name="&doc">property_doc</property>
                   <property name="header_stuff">
Index: openacs-4/packages/xowiki/www/oacs-view3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/oacs-view3.adp,v
diff -u -r1.45 -r1.46
--- openacs-4/packages/xowiki/www/oacs-view3.adp	3 Jul 2015 10:30:42 -0000	1.45
+++ openacs-4/packages/xowiki/www/oacs-view3.adp	3 Jul 2015 11:04:08 -0000	1.46
@@ -2,7 +2,7 @@
 <master>
                   <property name="doc(title)">@title;literal@</property>
                   <property name="context">@context;literal@</property>
-                  <if @item_id@ not nil><property name="displayed_object_id">@item_id@</property></if>
+                  <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
                   <property name="&body">property_body</property>
                   <property name="&doc">property_doc</property>
                   <property name="header_stuff">
Index: openacs-4/packages/xowiki/www/view-book-no-ajax.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view-book-no-ajax.adp,v
diff -u -r1.28 -r1.29
--- openacs-4/packages/xowiki/www/view-book-no-ajax.adp	3 Jul 2015 10:30:42 -0000	1.28
+++ openacs-4/packages/xowiki/www/view-book-no-ajax.adp	3 Jul 2015 11:04:08 -0000	1.29
@@ -2,7 +2,7 @@
 <master>
                   <property name="doc(title)">@title;literal@</property>
                   <property name="context">@context;literal@</property>
-                  <if @item_id@ not nil><property name="displayed_object_id">@item_id@</property></if>
+                  <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
                   <property name="&body">property_body</property>
                   <property name="&doc">property_doc</property>
                   <property name="header_stuff">
Index: openacs-4/packages/xowiki/www/view-book.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view-book.adp,v
diff -u -r1.39 -r1.40
--- openacs-4/packages/xowiki/www/view-book.adp	3 Jul 2015 10:30:42 -0000	1.39
+++ openacs-4/packages/xowiki/www/view-book.adp	3 Jul 2015 11:04:08 -0000	1.40
@@ -2,7 +2,7 @@
 <master>
                   <property name="doc(title)">@title;literal@</property>
                   <property name="context">@context;literal@</property>
-                  <if @item_id@ not nil><property name="displayed_object_id">@item_id@</property></if>
+                  <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
                   <property name="&body">property_body</property>
                   <property name="&doc">property_doc</property>
                   <property name="header_stuff">
Index: openacs-4/packages/xowiki/www/view-default.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view-default.adp,v
diff -u -r1.68 -r1.69
--- openacs-4/packages/xowiki/www/view-default.adp	3 Jul 2015 10:30:42 -0000	1.68
+++ openacs-4/packages/xowiki/www/view-default.adp	3 Jul 2015 11:04:08 -0000	1.69
@@ -2,7 +2,7 @@
 <master>
                   <property name="doc(title)">@title;literal@</property>
                   <property name="context">@context;literal@</property>
-                  <if @item_id@ not nil><property name="displayed_object_id">@item_id@</property></if>
+                  <if @item_id@ not nil><property name="displayed_object_id">@item_id;literal@</property></if>
                   <property name="&body">property_body</property>
                   <property name="&doc">property_doc</property>
                   <property name="header_stuff">