Index: openacs-4/packages/calendar/www/cal-dayview.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-dayview.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/calendar/www/cal-dayview.adp	23 Apr 2001 23:09:38 -0000	1.1
+++ openacs-4/packages/calendar/www/cal-dayview.adp	22 May 2003 14:25:22 -0000	1.2
@@ -7,5 +7,5 @@
 -->
 
 
-@row_html@
+@row_html;noquote@
 
Index: openacs-4/packages/calendar/www/cal-item-delete-confirm.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-delete-confirm.adp,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/calendar/www/cal-item-delete-confirm.adp	7 Nov 2002 12:45:07 -0000	1.8
+++ openacs-4/packages/calendar/www/cal-item-delete-confirm.adp	22 May 2003 14:25:22 -0000	1.9
@@ -8,15 +8,15 @@
 
 
 <master>
-<property name="title">#calendar.Calendar_Item_Delete#: @cal_item.name@</property>
+<property name="title">#calendar.Calendar_Item_Delete#: @cal_item.name;noquote@</property>
 <property name="context">#calendar.Delete#</property>
 
 <table>
 
   <tr>
     <td valign=top>
       <p>
-      @cal_nav@
+      @cal_nav;noquote@
     </td>	
 
     <td valign=top> 
Index: openacs-4/packages/calendar/www/cal-item-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-item-edit.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/calendar/www/cal-item-edit.adp	18 Nov 2002 18:01:11 -0000	1.5
+++ openacs-4/packages/calendar/www/cal-item-edit.adp	22 May 2003 14:25:22 -0000	1.6
@@ -8,7 +8,7 @@
   <tr>
     <td valign=top width=150>
       <p>
-      @cal_nav@
+      @cal_nav;noquote@
       <p>
 	<include src="cal-options">	
     </td>	
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 -N -r1.15 -r1.16
--- openacs-4/packages/calendar/www/cal-item-view.adp	18 Nov 2002 18:01:11 -0000	1.15
+++ openacs-4/packages/calendar/www/cal-item-view.adp	22 May 2003 14:25:22 -0000	1.16
@@ -8,15 +8,15 @@
 
 
 <master>
-<property name="title">#calendar.Calendar_Item#: @cal_item.name@</property>
+<property name="title">#calendar.Calendar_Item#: @cal_item.name;noquote@</property>
 <property name="context">#calendar.Item#</property>
 
 <table>
 
   <tr>
     <td valign=top>
       <p>
-      @cal_nav@
+      @cal_nav;noquote@
     </td>	
 
     <td valign=top> 
Index: openacs-4/packages/calendar/www/cal-monthview.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-monthview.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/calendar/www/cal-monthview.adp	5 Jul 2002 15:56:53 -0000	1.2
+++ openacs-4/packages/calendar/www/cal-monthview.adp	22 May 2003 14:25:22 -0000	1.3
@@ -16,7 +16,7 @@
   </td>
 </tr>
 
- @row_html@
+ @row_html;noquote@
 </table>
 
  
\ No newline at end of file
Index: openacs-4/packages/calendar/www/cal-nav.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-nav.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/calendar/www/cal-nav.adp	30 Nov 2002 17:28:09 -0000	1.3
+++ openacs-4/packages/calendar/www/cal-nav.adp	22 May 2003 14:25:22 -0000	1.4
@@ -7,7 +7,7 @@
 -->
 
 
-@html@
+@html;noquote@
 
 <p>
 <li><a href=?date=@date@&view=@view@&action=add> #calendar.add_an_event# </a>
Index: openacs-4/packages/calendar/www/cal-weekview.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-weekview.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/calendar/www/cal-weekview.adp	23 Apr 2001 23:09:38 -0000	1.1
+++ openacs-4/packages/calendar/www/cal-weekview.adp	22 May 2003 14:25:22 -0000	1.2
@@ -7,5 +7,5 @@
 -->
 
 
-@row_html@
+@row_html;noquote@
 
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 -N -r1.6 -r1.7
--- openacs-4/packages/calendar/www/calendar-item-types.adp	7 Nov 2002 12:45:07 -0000	1.6
+++ openacs-4/packages/calendar/www/calendar-item-types.adp	22 May 2003 14:25:22 -0000	1.7
@@ -1,6 +1,6 @@
 <master>
 <property name="title">#calendar.Calendar_Item_Types#</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 
 <ul>
 <%
Index: openacs-4/packages/calendar/www/view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view.adp,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/calendar/www/view.adp	17 May 2003 10:21:14 -0000	1.7
+++ openacs-4/packages/calendar/www/view.adp	22 May 2003 14:25:22 -0000	1.8
@@ -7,7 +7,7 @@
   <tr>
     <td valign=top width=150>
       <p>
-      @cal_nav@
+      @cal_nav;noquote@
       <p>
 	<include src="cal-options">	
     </td>	
Index: openacs-4/packages/calendar/www/admin/calendar-permissions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/admin/Attic/calendar-permissions.adp,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/calendar/www/admin/calendar-permissions.adp	7 Nov 2002 12:45:12 -0000	1.6
+++ openacs-4/packages/calendar/www/admin/calendar-permissions.adp	22 May 2003 14:25:39 -0000	1.7
@@ -1,5 +1,5 @@
 <master>
-<property name="title">#calendar.lt_Calendar_Administrati#: @party_name@ </property>
+<property name="title">#calendar.lt_Calendar_Administrati#: @party_name;noquote@ </property>
 <property name="context">#calendar.Calendar_Permissions#</property>
 
 
Index: openacs-4/packages/calendar/www/admin/calendar-preferences.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/admin/Attic/calendar-preferences.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/calendar/www/admin/calendar-preferences.adp	7 Nov 2002 12:45:12 -0000	1.5
+++ openacs-4/packages/calendar/www/admin/calendar-preferences.adp	22 May 2003 14:25:39 -0000	1.6
@@ -7,7 +7,7 @@
      	@cvs-id $Id$
 -->
 <master>
-<property name="title">#calendar.lt_Calendar_Administrati#: @party_name@ </property>
+<property name="title">#calendar.lt_Calendar_Administrati#: @party_name;noquote@ </property>
 <property name="context"> #calendar.Calendar_Preferences# </property>
 
 
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 -N -r1.6 -r1.7
--- openacs-4/packages/calendar/www/admin/index.adp	7 Nov 2002 12:45:12 -0000	1.6
+++ openacs-4/packages/calendar/www/admin/index.adp	22 May 2003 14:25:39 -0000	1.7
@@ -8,8 +8,8 @@
 
 
 <master>
-<property name="title">#calendar.lt_Calendar_Administrati_1# # @user_id@</property>
-<property name="context">@context_bar@</property>
+<property name="title">#calendar.lt_Calendar_Administrati_1# # @user_id;noquote@</property>
+<property name="context">@context_bar;noquote@</property>
 
 
 <p>
Index: openacs-4/packages/calendar/www/admin/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/admin/Attic/one.adp,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/calendar/www/admin/one.adp	7 Nov 2002 12:45:12 -0000	1.6
+++ openacs-4/packages/calendar/www/admin/one.adp	22 May 2003 14:25:39 -0000	1.7
@@ -8,8 +8,8 @@
 
 
 <master>
-<property name="title">#calendar.lt_Calendar_Administrati#: @title@ </property>
-<property name="context">@context@</property>
+<property name="title">#calendar.lt_Calendar_Administrati#: @title;noquote@ </property>
+<property name="context">@context;noquote@</property>
 
 <if @action@ eq view>
 	#calendar.lt_Calendar_detail_listi#
Index: openacs-4/packages/categories/www/cadmin/category-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-delete.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/categories/www/cadmin/category-delete.adp	23 Apr 2003 12:29:27 -0000	1.1
+++ openacs-4/packages/categories/www/cadmin/category-delete.adp	22 May 2003 14:25:54 -0000	1.2
@@ -1,7 +1,7 @@
 <master src="master">
 <property name="page_title">@page_title;noquote@</property>
 <property name="context_bar">@context_bar;noquote@</property>
-<property name="locale">@locale@</property>
+<property name="locale">@locale;noquote@</property>
 
 <if @mapped_objects_p@ eq 1>
 This category is still mapped to some objects.
Index: openacs-4/packages/categories/www/cadmin/category-form.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-form.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/categories/www/cadmin/category-form.adp	23 Apr 2003 12:29:27 -0000	1.1
+++ openacs-4/packages/categories/www/cadmin/category-form.adp	22 May 2003 14:25:54 -0000	1.2
@@ -1,5 +1,5 @@
 <master src="master">
-<property name="page_title">@page_title@</property>
+<property name="page_title">@page_title;noquote@</property>
 <property name="context_bar">@context_bar;noquote@</property>
 <property name="change_locale">f</property>
 
Index: openacs-4/packages/categories/www/cadmin/category-set-parent.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/Attic/category-set-parent.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/categories/www/cadmin/category-set-parent.adp	23 Apr 2003 12:29:27 -0000	1.1
+++ openacs-4/packages/categories/www/cadmin/category-set-parent.adp	22 May 2003 14:25:54 -0000	1.2
@@ -1,7 +1,7 @@
 <master src="master">
 <property name="page_title">@page_title;noquote@</property>
 <property name="context_bar">@context_bar;noquote@</property>
-<property name="locale">@locale@</property>
+<property name="locale">@locale;noquote@</property>
 
 <if @tree:rowcount@ gt 0>
   <table>
Index: openacs-4/packages/categories/www/cadmin/category-usage.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-usage.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/categories/www/cadmin/category-usage.adp	23 Apr 2003 12:29:27 -0000	1.1
+++ openacs-4/packages/categories/www/cadmin/category-usage.adp	22 May 2003 14:25:54 -0000	1.2
@@ -1,7 +1,7 @@
 <master src="master">
 <property name="page_title">@page_title;noquote@</property>
 <property name="context_bar">@context_bar;noquote@</property>
-<property name="locale">@locale@</property>
+<property name="locale">@locale;noquote@</property>
 
 <!-- pagination context bar -->
 <table cellpadding=4 cellspacing=0 border=0 width="95%">
Index: openacs-4/packages/categories/www/cadmin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/index.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/categories/www/cadmin/index.adp	23 Apr 2003 12:29:27 -0000	1.1
+++ openacs-4/packages/categories/www/cadmin/index.adp	22 May 2003 14:25:54 -0000	1.2
@@ -1,7 +1,7 @@
 <master src="master">
 <property name="page_title">@page_title;noquote@</property>
 <property name="context_bar">@context_bar;noquote@</property>
-<property name="locale">@locale@</property>
+<property name="locale">@locale;noquote@</property>
 
 <h3> Trees you have the write permission on: </h3>
 
Index: openacs-4/packages/categories/www/cadmin/one-object.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/Attic/one-object.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/categories/www/cadmin/one-object.adp	23 Apr 2003 12:29:27 -0000	1.1
+++ openacs-4/packages/categories/www/cadmin/one-object.adp	22 May 2003 14:25:54 -0000	1.2
@@ -1,7 +1,7 @@
 <master src="master">
 <property name="page_title">@page_title;noquote@</property>
 <property name="context_bar">@context_bar;noquote@</property>
-<property name="locale">@locale@</property>
+<property name="locale">@locale;noquote@</property>
 
 <ul>
   <li>
Index: openacs-4/packages/categories/www/cadmin/subtree-choose.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/Attic/subtree-choose.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/categories/www/cadmin/subtree-choose.adp	23 Apr 2003 12:29:27 -0000	1.1
+++ openacs-4/packages/categories/www/cadmin/subtree-choose.adp	22 May 2003 14:25:54 -0000	1.2
@@ -1,7 +1,7 @@
 <master src="master">
 <property name="page_title">@page_title;noquote@</property>
 <property name="context_bar">@context_bar;noquote@</property>
-<property name="locale">@locale@</property>
+<property name="locale">@locale;noquote@</property>
 
 <if @tree:rowcount@ lt 2>
   <ul>
Index: openacs-4/packages/categories/www/cadmin/tree-copy.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-copy.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/categories/www/cadmin/tree-copy.adp	23 Apr 2003 12:29:27 -0000	1.1
+++ openacs-4/packages/categories/www/cadmin/tree-copy.adp	22 May 2003 14:25:54 -0000	1.2
@@ -1,7 +1,7 @@
 <master src="master">
 <property name="page_title">@page_title;noquote@</property>
 <property name="context_bar">@context_bar;noquote@</property>
-<property name="locale">@locale@</property>
+<property name="locale">@locale;noquote@</property>
 
 <ul>
   <multiple name="trees">
Index: openacs-4/packages/categories/www/cadmin/tree-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-delete.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/categories/www/cadmin/tree-delete.adp	23 Apr 2003 12:29:27 -0000	1.1
+++ openacs-4/packages/categories/www/cadmin/tree-delete.adp	22 May 2003 14:25:54 -0000	1.2
@@ -1,7 +1,7 @@
 <master src="master">
 <property name="page_title">@page_title;noquote@</property>
 <property name="context_bar">@context_bar;noquote@</property>
-<property name="locale">@locale@</property>
+<property name="locale">@locale;noquote@</property>
 
 <p>
 <table>
Index: openacs-4/packages/categories/www/cadmin/tree-form.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-form.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/categories/www/cadmin/tree-form.adp	23 Apr 2003 12:29:27 -0000	1.1
+++ openacs-4/packages/categories/www/cadmin/tree-form.adp	22 May 2003 14:25:54 -0000	1.2
@@ -1,5 +1,5 @@
 <master src="master">
-<property name="page_title">@page_title@</property>
+<property name="page_title">@page_title;noquote@</property>
 <property name="context_bar">@context_bar;noquote@</property>
 <property name="change_locale">f</property>
 
Index: openacs-4/packages/categories/www/cadmin/tree-unmap.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-unmap.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/categories/www/cadmin/tree-unmap.adp	23 Apr 2003 12:29:27 -0000	1.1
+++ openacs-4/packages/categories/www/cadmin/tree-unmap.adp	22 May 2003 14:25:54 -0000	1.2
@@ -1,7 +1,7 @@
 <master src="master">
 <property name="page_title">@page_title;noquote@</property>
 <property name="context_bar">@context_bar;noquote@</property>
-<property name="locale">@locale@</property>
+<property name="locale">@locale;noquote@</property>
 
 Are you sure you want to unmap the tree "@tree_name@" from "@object_name@"?
 
Index: openacs-4/packages/categories/www/cadmin/tree-update.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/Attic/tree-update.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/categories/www/cadmin/tree-update.adp	23 Apr 2003 12:29:27 -0000	1.1
+++ openacs-4/packages/categories/www/cadmin/tree-update.adp	22 May 2003 14:25:54 -0000	1.2
@@ -1,7 +1,7 @@
 <master src="master">
 <property name="page_title">@page_title;noquote@</property>
 <property name="context_bar">@context_bar;noquote@</property>
-<property name="locale">@locale@</property>
+<property name="locale">@locale;noquote@</property>
 
 Are you sure that you want to delete these categories?
 <ul>
Index: openacs-4/packages/categories/www/cadmin/tree-usage.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-usage.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/categories/www/cadmin/tree-usage.adp	23 Apr 2003 12:29:27 -0000	1.1
+++ openacs-4/packages/categories/www/cadmin/tree-usage.adp	22 May 2003 14:25:54 -0000	1.2
@@ -1,7 +1,7 @@
 <master src="master">
 <property name="page_title">@page_title;noquote@</property>
 <property name="context_bar">@context_bar;noquote@</property>
-<property name="locale">@locale@</property>
+<property name="locale">@locale;noquote@</property>
 
 <p>
 <table>
Index: openacs-4/packages/categories/www/cadmin/tree-view-simple.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/Attic/tree-view-simple.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/categories/www/cadmin/tree-view-simple.adp	23 Apr 2003 12:29:27 -0000	1.1
+++ openacs-4/packages/categories/www/cadmin/tree-view-simple.adp	22 May 2003 14:25:54 -0000	1.2
@@ -1,7 +1,7 @@
 <master src="master">
 <property name="page_title">@page_title;noquote@</property>
 <property name="context_bar">@context_bar;noquote@</property>
-<property name="locale">@locale@</property>
+<property name="locale">@locale;noquote@</property>
 
 <table>
   <if @tree:rowcount@ ne 0>
Index: openacs-4/packages/categories/www/cadmin/tree-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-view.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/categories/www/cadmin/tree-view.adp	23 Apr 2003 12:29:27 -0000	1.1
+++ openacs-4/packages/categories/www/cadmin/tree-view.adp	22 May 2003 14:25:54 -0000	1.2
@@ -1,7 +1,7 @@
 <master src="master">
 <property name="page_title">@page_title;noquote@</property>
 <property name="context_bar">@context_bar;noquote@</property>
-<property name="locale">@locale@</property>
+<property name="locale">@locale;noquote@</property>
 
 <p>
 <table>
Index: openacs-4/packages/chat/www/grant-entry.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/grant-entry.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/chat/www/grant-entry.adp	6 Sep 2002 21:50:28 -0000	1.3
+++ openacs-4/packages/chat/www/grant-entry.adp	22 May 2003 14:26:08 -0000	1.4
@@ -6,8 +6,8 @@
     @cvs-id $Id$
 -->
 <master>
-<property name="context">@context_bar@</property>
-<property name="title">@title@</property>
+<property name="context">@context_bar;noquote@</property>
+<property name="title">@title;noquote@</property>
 
 <form method=post action=@action@>
     <input type=hidden name=room_id value=@room_id@>
Index: openacs-4/packages/chat/www/html-chat.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/Attic/html-chat.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/chat/www/html-chat.adp	6 Sep 2002 21:50:28 -0000	1.3
+++ openacs-4/packages/chat/www/html-chat.adp	22 May 2003 14:26:08 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
-<property name="context">@context_bar@</property>
-<property name="title">@room_name@</property>
+<property name="context">@context_bar;noquote@</property>
+<property name="title">@room_name;noquote@</property>
 
 [<a href="room-exit?room_id=@room_id@">Log off</a>]
 <form method=post action="chat">
Index: openacs-4/packages/chat/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/index.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/chat/www/index.adp	6 Sep 2002 21:50:28 -0000	1.3
+++ openacs-4/packages/chat/www/index.adp	22 May 2003 14:26:08 -0000	1.4
@@ -6,7 +6,7 @@
      @cvs-id $Id$
 -->
 <master>
-<property name="context">@context_bar@</property>
+<property name="context">@context_bar;noquote@</property>
 <property name="title">Chat main page</property>
 
 <if @room_create_p@ ne 0>
Index: openacs-4/packages/chat/www/java-chat.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/java-chat.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/chat/www/java-chat.adp	6 Sep 2002 21:50:28 -0000	1.3
+++ openacs-4/packages/chat/www/java-chat.adp	22 May 2003 14:26:08 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
-<property name="context">@context_bar@</property>
-<property name="title">@room_name@</property>
+<property name="context">@context_bar;noquote@</property>
+<property name="title">@room_name;noquote@</property>
 
 <center>
    <applet code=adChatApplet.class archive=chat.jar width=@width@ height=@height@>
Index: openacs-4/packages/chat/www/message-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/message-delete.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/chat/www/message-delete.adp	6 Sep 2002 21:50:28 -0000	1.3
+++ openacs-4/packages/chat/www/message-delete.adp	22 May 2003 14:26:08 -0000	1.4
@@ -6,7 +6,7 @@
     @cvs-id $Id$
 -->
 <master>
-<property name="context">@context_bar@</property>
+<property name="context">@context_bar;noquote@</property>
 <property name="title">Confirm message delete</property>
 
 <form method="post" action="message-delete-2">
Index: openacs-4/packages/chat/www/moderator-revoke.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/moderator-revoke.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/chat/www/moderator-revoke.adp	6 Sep 2002 21:50:28 -0000	1.3
+++ openacs-4/packages/chat/www/moderator-revoke.adp	22 May 2003 14:26:08 -0000	1.4
@@ -6,7 +6,7 @@
     @cvs-id $Id$
 -->
 <master>
-<property name="context">@context_bar@</property>
+<property name="context">@context_bar;noquote@</property>
 <property name="title">Confirm revoke moderator</property>
 
 <form method=post action=moderator-revoke-2>
Index: openacs-4/packages/chat/www/room-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/room-delete.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/chat/www/room-delete.adp	6 Sep 2002 21:50:28 -0000	1.3
+++ openacs-4/packages/chat/www/room-delete.adp	22 May 2003 14:26:08 -0000	1.4
@@ -6,7 +6,7 @@
     @cvs-id $Id$
 -->
 <master>
-<property name="context">@context_bar@</property>
+<property name="context">@context_bar;noquote@</property>
 <property name="title">Confirm room delete</property>
 
 <form method="post" action="room-delete-2">	
Index: openacs-4/packages/chat/www/room-entry.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/Attic/room-entry.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/chat/www/room-entry.adp	6 Sep 2002 21:50:28 -0000	1.3
+++ openacs-4/packages/chat/www/room-entry.adp	22 May 2003 14:26:08 -0000	1.4
@@ -6,8 +6,8 @@
     @cvs-id $Id$
 -->
 <master>
-<property name="context">@context_bar@</property>
-<property name="title">@title@</property>
+<property name="context">@context_bar;noquote@</property>
+<property name="title">@title;noquote@</property>
 
 <form action="@action@" method="post">
    <input type="hidden" name="room_id" value="@room_id@">
Index: openacs-4/packages/chat/www/room.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/room.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/chat/www/room.adp	6 Sep 2002 21:50:28 -0000	1.3
+++ openacs-4/packages/chat/www/room.adp	22 May 2003 14:26:08 -0000	1.4
@@ -6,7 +6,7 @@
      @cvs-id $Id$
 -->
 <master>
-<property name="context">@context_bar@</property>
+<property name="context">@context_bar;noquote@</property>
 <property name="title">Room Information</property>
 
 <h4>Room information</h4>
Index: openacs-4/packages/chat/www/transcript-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/transcript-delete.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/chat/www/transcript-delete.adp	6 Sep 2002 21:50:28 -0000	1.3
+++ openacs-4/packages/chat/www/transcript-delete.adp	22 May 2003 14:26:08 -0000	1.4
@@ -6,7 +6,7 @@
     @cvs-id $Id$
 -->
 <master>
-<property name="context">@context_bar@</property>
+<property name="context">@context_bar;noquote@</property>
 <property name="title">Confirm chat transcript delete</property>
 
 <form method="post" action="transcript-delete-2">
Index: openacs-4/packages/chat/www/transcript-entry.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/transcript-entry.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/chat/www/transcript-entry.adp	6 Sep 2002 21:50:28 -0000	1.3
+++ openacs-4/packages/chat/www/transcript-entry.adp	22 May 2003 14:26:08 -0000	1.4
@@ -6,8 +6,8 @@
     @cvs-id $Id$
 -->
 <master>
-<property name="context">@context_bar@</property>
-<property name="title">@title@</property>
+<property name="context">@context_bar;noquote@</property>
+<property name="title">@title;noquote@</property>
 
 <form action="@action@" method="post">
     <input type="hidden" name="transcript_id" value="@transcript_id@">
Index: openacs-4/packages/chat/www/transcript-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/transcript-view.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/chat/www/transcript-view.adp	6 Sep 2002 21:50:28 -0000	1.3
+++ openacs-4/packages/chat/www/transcript-view.adp	22 May 2003 14:26:08 -0000	1.4
@@ -6,7 +6,7 @@
      @cvs-id $Id$
 -->
 <master>
-<property name="context">@context_bar@</property>
+<property name="context">@context_bar;noquote@</property>
 <property name="title">Transcript preview</property>
 
 [<a href="transcript-edit?transcript_id=@transcript_id@&room_id=@room_id@">Edit</a>]
Index: openacs-4/packages/chat/www/unauthorized.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/unauthorized.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/chat/www/unauthorized.adp	6 Sep 2002 21:50:28 -0000	1.3
+++ openacs-4/packages/chat/www/unauthorized.adp	22 May 2003 14:26:08 -0000	1.4
@@ -6,7 +6,7 @@
     @cvs-id $Id$
 -->
 <master>
-<property name="context">@context_bar@</property>
+<property name="context">@context_bar;noquote@</property>
 <property name="title">Unauthorized</property>
 
 You don't have permission to enter this chat room. 
Index: openacs-4/packages/chat/www/user-revoke.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/Attic/user-revoke.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/chat/www/user-revoke.adp	6 Sep 2002 21:50:28 -0000	1.3
+++ openacs-4/packages/chat/www/user-revoke.adp	22 May 2003 14:26:08 -0000	1.4
@@ -6,7 +6,7 @@
     @cvs-id $Id$
 -->
 <master>
-<property name="context">@context_bar@</property>
+<property name="context">@context_bar;noquote@</property>
 <property name="title">Confirm revoke user</property>
 
 <form method=post action=user-revoke-2>
Index: openacs-4/packages/chat/www/user-unban.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/user-unban.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/chat/www/user-unban.adp	6 Sep 2002 21:50:28 -0000	1.3
+++ openacs-4/packages/chat/www/user-unban.adp	22 May 2003 14:26:08 -0000	1.4
@@ -6,7 +6,7 @@
     @cvs-id $Id$
 -->
 <master>
-<property name="context">@context_bar@</property>
+<property name="context">@context_bar;noquote@</property>
 <property name="title">Confirm unban user</property>
 
 <form method=post action=user-unban-2>
Index: openacs-4/packages/clickthrough/www/admin/all-from-local.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/clickthrough/www/admin/all-from-local.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/clickthrough/www/admin/all-from-local.adp	6 Sep 2002 21:50:30 -0000	1.3
+++ openacs-4/packages/clickthrough/www/admin/all-from-local.adp	22 May 2003 14:26:38 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
-<property name=title>Clickthroughs from @local_url@</property>
-<property name="context">@context@</property>
+<property name=title>Clickthroughs from @local_url;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 Clickthroughs from <a href="@local_url@">@local_url@</a>
 
Index: openacs-4/packages/clickthrough/www/admin/all-to-foreign.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/clickthrough/www/admin/all-to-foreign.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/clickthrough/www/admin/all-to-foreign.adp	6 Sep 2002 21:50:30 -0000	1.3
+++ openacs-4/packages/clickthrough/www/admin/all-to-foreign.adp	22 May 2003 14:26:38 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
-<property name=title>Clickthroughs to @foreign_url@</property>
-<property name="context">@context@</property>
+<property name=title>Clickthroughs to @foreign_url;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 
 
Index: openacs-4/packages/clickthrough/www/admin/by-foreign-url-aggregate.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/clickthrough/www/admin/by-foreign-url-aggregate.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/clickthrough/www/admin/by-foreign-url-aggregate.adp	6 Sep 2002 21:50:30 -0000	1.3
+++ openacs-4/packages/clickthrough/www/admin/by-foreign-url-aggregate.adp	22 May 2003 14:26:38 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
 <property name=title>Clickthroughs by foreign URL: summary report</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 
 Note: this page may be slow to generate; it requires a tremendous amount of chugging by the RDBMS.
 
Index: openacs-4/packages/clickthrough/www/admin/by-foreign-url.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/clickthrough/www/admin/by-foreign-url.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/clickthrough/www/admin/by-foreign-url.adp	6 Sep 2002 21:50:30 -0000	1.3
+++ openacs-4/packages/clickthrough/www/admin/by-foreign-url.adp	22 May 2003 14:26:38 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
 <property name=title>Clickthroughs by foreign URL</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 
 <ul>
   <multiple name="urls">
Index: openacs-4/packages/clickthrough/www/admin/by-local-url-aggregate.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/clickthrough/www/admin/by-local-url-aggregate.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/clickthrough/www/admin/by-local-url-aggregate.adp	6 Sep 2002 21:50:30 -0000	1.3
+++ openacs-4/packages/clickthrough/www/admin/by-local-url-aggregate.adp	22 May 2003 14:26:38 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
 <property name=title>Clickthroughs by local URL: summary report</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 
 Note: this page may be slow to generate; it requires a tremendous amount of chugging by the RDBMS.
 
Index: openacs-4/packages/clickthrough/www/admin/by-local-url.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/clickthrough/www/admin/by-local-url.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/clickthrough/www/admin/by-local-url.adp	6 Sep 2002 21:50:30 -0000	1.3
+++ openacs-4/packages/clickthrough/www/admin/by-local-url.adp	22 May 2003 14:26:38 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
 <property name=title>Clickthroughs by local URL</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 
 <ul>
   <multiple name="urls">
Index: openacs-4/packages/clickthrough/www/admin/one-foreign-one-day.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/clickthrough/www/admin/one-foreign-one-day.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/clickthrough/www/admin/one-foreign-one-day.adp	6 Sep 2002 21:50:30 -0000	1.4
+++ openacs-4/packages/clickthrough/www/admin/one-foreign-one-day.adp	22 May 2003 14:26:38 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-<property name=title>Clickthroughs to @foreign_url@ on @query_date@</property>
-<property name="context">@context@</property>
+<property name=title>Clickthroughs to @foreign_url;noquote@ on @query_date;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <h2>Clickthroughs to <a href="@foreign_url@">@foreign_url@</a> on @query_date@</h2>
 
Index: openacs-4/packages/clickthrough/www/admin/one-local-one-day.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/clickthrough/www/admin/one-local-one-day.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/clickthrough/www/admin/one-local-one-day.adp	6 Sep 2002 21:50:30 -0000	1.4
+++ openacs-4/packages/clickthrough/www/admin/one-local-one-day.adp	22 May 2003 14:26:38 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-<property name=title>Clickthroughs from @local_url@ on @query_date@</property>
-<property name="context">@context@</property>
+<property name=title>Clickthroughs from @local_url;noquote@ on @query_date;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <h2>Clickthroughs from <a href="@local_url@">@local_url@</a> on @query_date@</h2>
 
Index: openacs-4/packages/clickthrough/www/admin/one-url-pair.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/clickthrough/www/admin/one-url-pair.adp,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/clickthrough/www/admin/one-url-pair.adp	6 Sep 2002 21:50:30 -0000	1.4
+++ openacs-4/packages/clickthrough/www/admin/one-url-pair.adp	22 May 2003 14:26:38 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-<property name=title>@local_url@ -&gt; @foreign_url@</property>
-<property name="context">@context@</property>
+<property name=title>@local_url;noquote@ -&gt; @foreign_url;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <h2>
   <a href="@local_url@">@local_url@</a> 
Index: openacs-4/packages/clickthrough/www/admin/report.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/clickthrough/www/admin/report.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/clickthrough/www/admin/report.adp	6 Sep 2002 21:50:30 -0000	1.3
+++ openacs-4/packages/clickthrough/www/admin/report.adp	22 May 2003 14:26:38 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
-<property name=title>Clickthroughs for @package_name@</property>
-<property name="context">@context@</property>
+<property name=title>Clickthroughs for @package_name;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <ul>
   <li><a href="by-foreign-url">by foreign URL</a></li>
Index: openacs-4/packages/cms/www/modules/categories/edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/categories/edit.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/categories/edit.adp	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/categories/edit.adp	22 May 2003 14:27:12 -0000	1.2
@@ -1,5 +1,5 @@
 <master src="../../master">
-<property name="title">Edit a @info.what@</property>
+<property name="title">Edit a @info.what;noquote@</property>
 
 <h3>Edit @info.what@</h3>
 
Index: openacs-4/packages/cms/www/modules/categories/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/categories/index.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/categories/index.adp	12 Jun 2001 04:13:46 -0000	1.2
+++ openacs-4/packages/cms/www/modules/categories/index.adp	22 May 2003 14:27:12 -0000	1.3
@@ -16,8 +16,8 @@
 </td>
 <td align=right class=small>
   <include src="../../bookmark" 
-           mount_point="@mount_point@" 
-           id="@id@">&nbsp;<tt><b>@info.path@</b></tt></td>
+           mount_point="@mount_point;noquote@" 
+           id="@id;noquote@">&nbsp;<tt><b>@info.path;noquote@</b></tt></td>
 </tr>
 </table>
 <br>
@@ -55,8 +55,8 @@
 
     <td nowrap height=12>
       <include src="../../bookmark" 
-               mount_point="@mount_point@" 
-               id="@items.keyword_id@">
+               mount_point="@mount_point;noquote@" 
+               id="@items.keyword_id;noquote@">
     </td>
     <td>
       <a href="index?id=@items.keyword_id@&mount_point=@mount_point@&parent_id=@id@">
Index: openacs-4/packages/cms/www/modules/items/attributes-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/attributes-edit.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/items/attributes-edit.adp	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/items/attributes-edit.adp	22 May 2003 14:27:33 -0000	1.2
@@ -1,5 +1,5 @@
 <master src="../../master">
-<property name="title">@page_title@</property>
+<property name="title">@page_title;noquote@</property>
 <h2>@page_title@</h2>
 
 <formtemplate id="add_revision" style="wizard"></formtemplate>
Index: openacs-4/packages/cms/www/modules/items/children.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/children.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/items/children.adp	12 Jun 2001 04:13:46 -0000	1.2
+++ openacs-4/packages/cms/www/modules/items/children.adp	22 May 2003 14:27:33 -0000	1.3
@@ -48,8 +48,8 @@
 
       <td height=12>
         <include src="../../bookmark" 
-                 mount_point="@mount_point@" 
-                 id="@children.item_id@">&nbsp;
+                 mount_point="@mount_point;noquote@" 
+                 id="@children.item_id;noquote@">&nbsp;
       </td>
 
       <td>@children.content_type@</td>
Index: openacs-4/packages/cms/www/modules/items/comment-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/comment-add.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/items/comment-add.adp	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/items/comment-add.adp	22 May 2003 14:27:33 -0000	1.2
@@ -1,5 +1,5 @@
 <master src="../../master">
-<property name="title">@page_title@</property>
+<property name="title">@page_title;noquote@</property>
 
 <h2>@page_title@</h2>
 
Index: openacs-4/packages/cms/www/modules/items/content-add-1.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/content-add-1.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/items/content-add-1.adp	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/items/content-add-1.adp	22 May 2003 14:27:33 -0000	1.2
@@ -1,5 +1,5 @@
 <master src="../../master">
-<property name="title">Add Content to @name@</property>
+<property name="title">Add Content to @name;noquote@</property>
 <h2>Add Content to @name@</h2>
 <formtemplate id="choose_content_method"></formtemplate>
 
Index: openacs-4/packages/cms/www/modules/items/content-add-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/content-add-2.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/items/content-add-2.adp	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/items/content-add-2.adp	22 May 2003 14:27:33 -0000	1.2
@@ -1,5 +1,5 @@
 <master src="../../master">
-<property name="title">@page_title@</property>
+<property name="title">@page_title;noquote@</property>
 <h2>@page_title@</h2>
 <formtemplate id="add_content"></formtemplate>
 
Index: openacs-4/packages/cms/www/modules/items/create-1.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/create-1.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/items/create-1.adp	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/items/create-1.adp	22 May 2003 14:27:33 -0000	1.2
@@ -1,5 +1,5 @@
 <master src="../../master">
-<property name="title">Create a New @content_type_name@</property>
+<property name="title">Create a New @content_type_name;noquote@</property>
 <h2>Create a New @content_type_name@</h2>
 <formtemplate id="choose_content_method"></formtemplate>
 
Index: openacs-4/packages/cms/www/modules/items/create-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/create-2.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/items/create-2.adp	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/items/create-2.adp	22 May 2003 14:27:33 -0000	1.2
@@ -1,6 +1,6 @@
 <if @is_wizard@ eq f>
   <master src="../../master">
-  <property name="title">@page_title@</property>
+  <property name="title">@page_title;noquote@</property>
 </if>
 <h2>@page_title@</h2>
 
Index: openacs-4/packages/cms/www/modules/items/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/index.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/items/index.adp	12 Jun 2001 04:13:46 -0000	1.2
+++ openacs-4/packages/cms/www/modules/items/index.adp	22 May 2003 14:27:33 -0000	1.3
@@ -1,7 +1,7 @@
 <master src="../../master">
 <property name="title">Content Item</property>
 
-<include src="../sitemap/ancestors" item_id=@item_id@>
+<include src="../sitemap/ancestors" item_id=@item_id;noquote@>
 
 <p>
 
@@ -27,23 +27,23 @@
 
 <if @item_props.tab@ eq editing>
   <tr><td>
-  <include src="attributes" revision_id="@info.latest_revision@">
+  <include src="attributes" revision_id="@info.latest_revision;noquote@">
   <p>
 
-  <include src="revisions" item_id="@item_id@" page="@page@">
+  <include src="revisions" item_id="@item_id;noquote@" page="@page;noquote@">
   <p>
 
-  <include src="keywords" item_id="@item_id@" mount_point="@mount_point@">  
+  <include src="keywords" item_id="@item_id;noquote@" mount_point="@mount_point;noquote@">  
   <p>
   </td></tr>
 </if>
 
 <if @item_props.tab@ eq children>
   <tr><td>
-  <include src="children" item_id="@item_id@">
+  <include src="children" item_id="@item_id;noquote@">
   <p>
 
-  <include src="related-items" item_id="@item_id@">
+  <include src="related-items" item_id="@item_id;noquote@">
   <p>
   </td></tr>
 
@@ -58,27 +58,27 @@
 <if @item_props.tab@ eq publishing>
   <tr><td>
 
-  <include src="publish-status" item_id="@item_id@">
+  <include src="publish-status" item_id="@item_id;noquote@">
   <p>
 
 
-  <include src="templates" item_id="@item_id@">
+  <include src="templates" item_id="@item_id;noquote@">
   <p>
 
   <if @user_permissions.cm_item_workflow@ eq t>
-    <include src="../workflow/case-status" item_id="@item_id@">
+    <include src="../workflow/case-status" item_id="@item_id;noquote@">
     <p>
   </if>
 
-  <include src="comments" item_id="@item_id@">
+  <include src="comments" item_id="@item_id;noquote@">
   <p>
   </td></tr>
 </if>
 
 <if @item_props.tab@ eq permissions>
   <tr><td>
-  <include src="../permissions/index" object_id="@item_id@" 
-    mount_point="@mount_point@" return_url="@return_url@" passthrough="@passthrough@">
+  <include src="../permissions/index" object_id="@item_id;noquote@" 
+    mount_point="@mount_point;noquote@" return_url="@return_url;noquote@" passthrough="@passthrough;noquote@">
   <p>
   </td></tr>
 </if>
Index: openacs-4/packages/cms/www/modules/items/relate-items-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/relate-items-2.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/items/relate-items-2.adp	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/items/relate-items-2.adp	22 May 2003 14:27:33 -0000	1.2
@@ -1,5 +1,5 @@
 <master src="../../master">
-<property name="title">@page_title@</property>
+<property name="title">@page_title;noquote@</property>
 
 <h2>@page_title@ (Step 2)</h2>
 <a href="index?item_id=@item_id@">@item_title@</a>
Index: openacs-4/packages/cms/www/modules/items/relate-items.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/relate-items.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/items/relate-items.adp	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/items/relate-items.adp	22 May 2003 14:27:33 -0000	1.2
@@ -1,5 +1,5 @@
 <master src="../../master">
-<property name="title">@page_title@</property>
+<property name="title">@page_title;noquote@</property>
 
 <h2>@page_title@ (Step 1)</h2>
 <a href="index?item_id=@item_id@">@item_title@</a>
Index: openacs-4/packages/cms/www/modules/items/related-items.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/related-items.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/items/related-items.adp	12 Jun 2001 04:13:46 -0000	1.2
+++ openacs-4/packages/cms/www/modules/items/related-items.adp	22 May 2003 14:27:33 -0000	1.3
@@ -46,8 +46,8 @@
 
       <td nowrap height=12>
         <include src="../../bookmark" 
-                 mount_point="@mount_point@" 
-                 id="@related.item_id@">
+                 mount_point="@mount_point;noquote@" 
+                 id="@related.item_id;noquote@">
       </td>    
       <td>&nbsp;&nbsp;&nbsp;</td> 
       <td>@related.content_type@</td>
Index: openacs-4/packages/cms/www/modules/items/rename.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/rename.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/items/rename.adp	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/items/rename.adp	22 May 2003 14:27:33 -0000	1.2
@@ -1,5 +1,5 @@
 <master src="../../master">
-<property name="title">@page_title@</property>
+<property name="title">@page_title;noquote@</property>
   <h2>@page_title@</h2>
   <formtemplate id="rename_item"></formtemplate>  
   <p>
Index: openacs-4/packages/cms/www/modules/items/revision-add-1.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/revision-add-1.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/items/revision-add-1.adp	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/items/revision-add-1.adp	22 May 2003 14:27:33 -0000	1.2
@@ -1,5 +1,5 @@
 <master src="../../master">
-<property name="title">Add a Revision to @name@</property>
+<property name="title">Add a Revision to @name;noquote@</property>
 <h2>Add a Revision to @name@</h2>
 <formtemplate id="choose_content_method"></formtemplate>
 
Index: openacs-4/packages/cms/www/modules/items/revision-upload.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/revision-upload.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/items/revision-upload.adp	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/items/revision-upload.adp	22 May 2003 14:27:33 -0000	1.2
@@ -1,5 +1,5 @@
 <master src="../../master">
-<property name="title">@page_title@</property>
+<property name="title">@page_title;noquote@</property>
 
 <h2>@page_title@</h2>
 
Index: openacs-4/packages/cms/www/modules/items/revision.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/revision.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/items/revision.adp	12 Jun 2001 04:13:46 -0000	1.2
+++ openacs-4/packages/cms/www/modules/items/revision.adp	22 May 2003 14:27:33 -0000	1.3
@@ -1,5 +1,5 @@
 <master src="../../master">
-<property name="title">@page_title@</property>
+<property name="title">@page_title;noquote@</property>
 <h2>@page_title@</h2>
 
 
@@ -56,7 +56,7 @@
     </td>
   </tr>
 
-  @revision_attr_html@
+  @revision_attr_html;noquote@
 
 </table>
 <include src="../../table-footer">
Index: openacs-4/packages/cms/www/modules/items/revisions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/revisions.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/items/revisions.adp	12 Jun 2001 04:13:46 -0000	1.2
+++ openacs-4/packages/cms/www/modules/items/revisions.adp	22 May 2003 14:27:33 -0000	1.3
@@ -5,8 +5,8 @@
     <if @user_permissions.cm_write@ eq t>
       Add revised content via 
       <include src="content-method-links" 
-	item_id=@item_id@ 
-	content_type=@content_type@>
+	item_id=@item_id;noquote@ 
+	content_type=@content_type;noquote@>
     </if>
     <else>&nbsp;</else>
   </td>
@@ -83,5 +83,5 @@
 </td></tr>
 </table>
 
-@pagination_html@
+@pagination_html;noquote@
 
Index: openacs-4/packages/cms/www/modules/items/custom/image/attributes-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/custom/image/attributes-edit.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/items/custom/image/attributes-edit.adp	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/items/custom/image/attributes-edit.adp	22 May 2003 14:28:04 -0000	1.2
@@ -1,5 +1,5 @@
 <master src="../../../../master">
-<property name="title">Edit Attributes for @name@ - @title@</property>
+<property name="title">Edit Attributes for @name;noquote@ - @title;noquote@</property>
 
 <h2>Edit Attributes for @name@ - @title@</h2>
 <formtemplate id="image"></formtemplate>
Index: openacs-4/packages/cms/www/modules/items/custom/image/revision-add-1.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/items/custom/image/revision-add-1.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/items/custom/image/revision-add-1.adp	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/items/custom/image/revision-add-1.adp	22 May 2003 14:28:04 -0000	1.2
@@ -1,5 +1,5 @@
 <master src="../../../../master">
-<property name="title">Add a Revision to @name@ - @title@</property>
+<property name="title">Add a Revision to @name;noquote@ - @title;noquote@</property>
 
 <h2>Add a Revision to @name@ - @title@</h2>
 <formtemplate id="image"></formtemplate>
Index: openacs-4/packages/cms/www/modules/permissions/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/permissions/index.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/permissions/index.adp	12 Jun 2001 04:13:46 -0000	1.2
+++ openacs-4/packages/cms/www/modules/permissions/index.adp	22 May 2003 14:29:03 -0000	1.3
@@ -4,7 +4,7 @@
 
 <include src="../../table-header" 
   title="Permissions"
-  header="@header@">
+  header="@header;noquote@">
 
 
 <table bgcolor=#99CCFF cellspacing=0 cellpadding=2 border=0 width="100%">
Index: openacs-4/packages/cms/www/modules/permissions/permission-alter.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/permissions/permission-alter.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/permissions/permission-alter.adp	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/permissions/permission-alter.adp	22 May 2003 14:29:03 -0000	1.2
@@ -1,5 +1,5 @@
 <master src="../../master">
-<property name="title">Permissions on @info.object_name@ for @info.grantee_name@ </property>
+<property name="title">Permissions on @info.object_name;noquote@ for @info.grantee_name;noquote@ </property>
 
 <if @info.user_cm_perm@ eq t>
 
Index: openacs-4/packages/cms/www/modules/sitemap/ancestors.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/ancestors.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/sitemap/ancestors.adp	12 Jun 2001 04:13:46 -0000	1.2
+++ openacs-4/packages/cms/www/modules/sitemap/ancestors.adp	22 May 2003 14:29:51 -0000	1.3
@@ -29,8 +29,8 @@
   <td align=right valign=center nowrap>
     
     <include src="../../bookmark" 
-             mount_point="@mount_point@" 
-             id="@item_id@">
+             mount_point="@mount_point;noquote@" 
+             id="@item_id;noquote@">
     &nbsp;
     <b><tt>
     <if @preview_p@ eq t>
Index: openacs-4/packages/cms/www/modules/sitemap/attributes.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/attributes.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/sitemap/attributes.adp	8 Jun 2001 01:44:53 -0000	1.2
+++ openacs-4/packages/cms/www/modules/sitemap/attributes.adp	22 May 2003 14:29:51 -0000	1.3
@@ -1,5 +1,5 @@
 <master src="../../master">
-<property name="title">@page_title@</property>
+<property name="title">@page_title;noquote@</property>
 <h2>@page_title@</h2>
 
 
@@ -36,7 +36,7 @@
 </table>
 
 <if @user_permissions.cm_write@ eq t>
-  <include src="../../table-footer" footer="@register_marked_content_types@">
+  <include src="../../table-footer" footer="@register_marked_content_types;noquote@">
 </if>
 <else>
   <include src="../../table-footer">
@@ -67,6 +67,6 @@
 
 
 
-<include src="../permissions/index" object_id="@folder_id@" 
-  mount_point="@mount_point@" return_url="@return_url@" passthrough="@passthrough@">
+<include src="../permissions/index" object_id="@folder_id;noquote@" 
+  mount_point="@mount_point;noquote@" return_url="@return_url;noquote@" passthrough="@passthrough;noquote@">
 
Index: openacs-4/packages/cms/www/modules/sitemap/copy.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/copy.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/cms/www/modules/sitemap/copy.adp	12 Jun 2001 04:13:46 -0000	1.3
+++ openacs-4/packages/cms/www/modules/sitemap/copy.adp	22 May 2003 14:29:51 -0000	1.4
@@ -7,7 +7,7 @@
      your choices and return to this form.</p>
 </if>
 <else>
-<property name="title">Copy Items to @path@</property>
+<property name="title">Copy Items to @path;noquote@</property>
 <h2>Copy Items to @path@</h2>
 <formtemplate id="copy">
 <formwidget id="id">
Index: openacs-4/packages/cms/www/modules/sitemap/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/index.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/sitemap/index.adp	12 Jun 2001 04:13:46 -0000	1.2
+++ openacs-4/packages/cms/www/modules/sitemap/index.adp	22 May 2003 14:29:51 -0000	1.3
@@ -6,9 +6,9 @@
 </script> 
 
 <include src="ancestors" 
-  item_id=@id@ 
-  index_page_id=@index_page_id@ 
-  mount_point=@mount_point@>
+  item_id=@id;noquote@ 
+  index_page_id=@index_page_id;noquote@ 
+  mount_point=@mount_point;noquote@>
 
 <table width="95%" cellspacing=0 cellpadding=4>
 <tr>
@@ -124,8 +124,8 @@
 
       <td nowrap height=12>
         <include src="../../bookmark" 
-                 mount_point="@mount_point@" 
-                 id="@items.item_id@">&nbsp;
+                 mount_point="@mount_point;noquote@" 
+                 id="@items.item_id;noquote@">&nbsp;
       </td>
       <td>
 	<img width=24 height=24 
Index: openacs-4/packages/cms/www/modules/sitemap/move.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/sitemap/move.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/sitemap/move.adp	8 Jun 2001 01:44:53 -0000	1.2
+++ openacs-4/packages/cms/www/modules/sitemap/move.adp	22 May 2003 14:29:51 -0000	1.3
@@ -8,7 +8,7 @@
      your choices and return to this form.</p>
 </if>
 <else>
-<property name="title">Move Items to @path@</property>
+<property name="title">Move Items to @path;noquote@</property>
 <h2>Move Items to @path@</h2>
 <formtemplate id="move">
 <formwidget id="id">
Index: openacs-4/packages/cms/www/modules/templates/copy.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/copy.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/templates/copy.adp	12 Jun 2001 04:13:46 -0000	1.2
+++ openacs-4/packages/cms/www/modules/templates/copy.adp	22 May 2003 14:31:17 -0000	1.3
@@ -64,7 +64,7 @@
 <!-- begin listing -->
 <tr><td align=left>
 
-<include src=clipboard folder_id=@folder_id@ action=copy submit=Copy
+<include src=clipboard folder_id=@folder_id;noquote@ action=copy submit=Copy
          prompt="Check the items you wish to copy to the current folder.">
 
 </td></tr>
Index: openacs-4/packages/cms/www/modules/templates/delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/delete.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/templates/delete.adp	12 Jun 2001 04:13:46 -0000	1.2
+++ openacs-4/packages/cms/www/modules/templates/delete.adp	22 May 2003 14:31:17 -0000	1.3
@@ -64,7 +64,7 @@
 <!-- begin listing -->
 <tr><td align=left>
 
-<include src=clipboard folder_id=@folder_id@ action=delete submit=Delete
+<include src=clipboard folder_id=@folder_id;noquote@ action=delete submit=Delete
          prompt="Check the items you wish to delete.">
 
 </td></tr>
Index: openacs-4/packages/cms/www/modules/templates/move.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/move.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/templates/move.adp	12 Jun 2001 04:13:46 -0000	1.2
+++ openacs-4/packages/cms/www/modules/templates/move.adp	22 May 2003 14:31:17 -0000	1.3
@@ -64,7 +64,7 @@
 <!-- begin listing -->
 <tr><td align=left>
 
-<include src=clipboard folder_id=@folder_id@ action=move submit=Move
+<include src=clipboard folder_id=@folder_id;noquote@ action=move submit=Move
          prompt="Check the items you wish to move to the current folder.">
 
 </td></tr>
Index: openacs-4/packages/cms/www/modules/templates/properties.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/properties.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/templates/properties.adp	12 Jun 2001 04:13:46 -0000	1.2
+++ openacs-4/packages/cms/www/modules/templates/properties.adp	22 May 2003 14:31:17 -0000	1.3
@@ -116,7 +116,7 @@
 <td bgcolor=#FFFFFF>&nbsp;&nbsp;</td>
 <td bgcolor=#FFFFFF>
 
-  <include src=@tab@ template_id=@id@>
+  <include src=@tab;noquote@ template_id=@id;noquote@>
 
 </td>
 <td bgcolor=#FFFFFF>&nbsp;&nbsp;</td>
Index: openacs-4/packages/cms/www/modules/templates/template-create.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/templates/template-create.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/templates/template-create.adp	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/templates/template-create.adp	22 May 2003 14:31:17 -0000	1.2
@@ -1,5 +1,5 @@
 <master src="../../master">
-<property name="title">@page_title@</property>
+<property name="title">@page_title;noquote@</property>
 
 <h2>@page_title@</h2>
 <formtemplate id="create_template"></formtemplate>
Index: openacs-4/packages/cms/www/modules/types/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/index.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/types/index.adp	12 Jun 2001 04:13:46 -0000	1.2
+++ openacs-4/packages/cms/www/modules/types/index.adp	22 May 2003 14:32:35 -0000	1.3
@@ -1,5 +1,5 @@
 <master src="../../master">
-<property name="title">@page_title@</property>
+<property name="title">@page_title;noquote@</property>
 
 <if @refresh_tree@ eq t>
   <script language=javascript>
@@ -34,8 +34,8 @@
   </td>
   <td align=right>
     <include src="../../bookmark" 
-             mount_point="@mount_point@" 
-            id="@content_type@">&nbsp;
+             mount_point="@mount_point;noquote@" 
+            id="@content_type;noquote@">&nbsp;
     <font size=-1>Add this content type to the clipboard.</font>
   </td>
 </tr>
@@ -121,16 +121,16 @@
     <include src="../../table-footer">
     <p>
 
-    <include src="mime-types" content_type="@content_type@">
+    <include src="mime-types" content_type="@content_type;noquote@">
     <p>
 
-    <include src="content-method" content_type="@content_type@">
+    <include src="content-method" content_type="@content_type;noquote@">
   </td></tr>
 </if>
 
 <if @type_props.tab@ eq relations>
   <tr><td>
-    <include src="relations" type=@content_type@>
+    <include src="relations" type=@content_type;noquote@>
   </td></tr>
 </if>
 
@@ -184,17 +184,17 @@
       </multiple>
     </else>
     </table>
-    <include src="../../table-footer" footer="@footer@">
+    <include src="../../table-footer" footer="@footer;noquote@">
   </td></tr>
 </if>
 
 <if @type_props.tab@ eq permissions>
   <tr><td>
     <include src="../permissions/index" 
-      object_id=@module_id@ 
+      object_id=@module_id;noquote@ 
       mount_point="types" 
-      return_url="@return_url@" 
-      passthrough="@passthrough@">
+      return_url="@return_url;noquote@" 
+      passthrough="@passthrough;noquote@">
   </td></tr>
 </if>
 
Index: openacs-4/packages/cms/www/modules/types/register-templates.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/register-templates.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/types/register-templates.adp	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/types/register-templates.adp	22 May 2003 14:32:35 -0000	1.2
@@ -1,5 +1,5 @@
 <master src="../../master">
-<property name="title">@page_title@</property>
+<property name="title">@page_title;noquote@</property>
 
 <h2>@page_title@</h2>
 
Index: openacs-4/packages/cms/www/modules/types/relation-register.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/relation-register.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/types/relation-register.adp	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/types/relation-register.adp	22 May 2003 14:32:35 -0000	1.2
@@ -1,5 +1,5 @@
 <master src="../../master">
-<property name="title">Register a @rel_type_pretty@ Relation Type to @pretty_name@</property>
+<property name="title">Register a @rel_type_pretty;noquote@ Relation Type to @pretty_name;noquote@</property>
 
 <h2>Register a @rel_type_pretty@ Relation Type to @pretty_name@</h2>
 <formtemplate id="relation"></formtemplate>
Index: openacs-4/packages/cms/www/modules/types/widget-register-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/widget-register-2.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/types/widget-register-2.adp	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/types/widget-register-2.adp	22 May 2003 14:32:35 -0000	1.2
@@ -1,7 +1,7 @@
 <master src="../../master">
 <property name="title">Set Attribute Widget Params</property>
 
-<if @widget@ nil>
+<if @notification_chunk;noquote@ nil>
   <h3>You must select a widget for this attribute!</h3>
   <a href="widget-register?attribute_id=@attribute_id@">
     Select a widget</a>
Index: openacs-4/packages/cms/www/modules/types/widget-register-3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/widget-register-3.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/types/widget-register-3.adp	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/types/widget-register-3.adp	22 May 2003 14:32:35 -0000	1.2
@@ -1,7 +1,7 @@
 <master src="../../master">
 <property name="title">Preview Attribute Widget</property>
 
-<if @widget@ nil>
+<if @notification_chunk;noquote@ nil>
   <h3>You must select a widget for this attribute!</h3>
   <a href="widget-register?attribute_id=@attribute_id@">
     Select a widget</a>
Index: openacs-4/packages/cms/www/modules/types/widget-register.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/types/widget-register.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/types/widget-register.adp	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/types/widget-register.adp	22 May 2003 14:32:35 -0000	1.2
@@ -15,5 +15,5 @@
 </multiple>
 
 <hr>
-<include src="@wizard:current_url@">
+<include src="@wizard:current_url;noquote@">
 
Index: openacs-4/packages/cms/www/modules/users/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/users/index.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/users/index.adp	12 Jun 2001 04:13:46 -0000	1.2
+++ openacs-4/packages/cms/www/modules/users/index.adp	22 May 2003 14:33:57 -0000	1.3
@@ -9,8 +9,8 @@
 <tr>
   <td class=large>
     <include src="../../bookmark" 
-             mount_point="@mount_point@" 
-             id="@info.group_id@">&nbsp;
+             mount_point="@mount_point;noquote@" 
+             id="@info.group_id;noquote@">&nbsp;
     <b>@info.group_name@</b>
   </td>
 </tr>
@@ -45,8 +45,8 @@
   <else><tr bgcolor="#EEEEEE"></else>
     <td nowrap height=12>
       <include src="../../bookmark" 
-               mount_point="@mount_point@" 
-               id="@subgroups.group_id@">
+               mount_point="@mount_point;noquote@" 
+               id="@subgroups.group_id;noquote@">
     </td>
     <td>
       <a href="index?id=@subgroups.group_id@&mount_point=@mount_point@&parent_id=@id@">
@@ -93,8 +93,8 @@
   <else><tr bgcolor="#EEEEEE"></else>
     <td nowrap height=12>
       <include src="../../bookmark" 
-               mount_point="@mount_point@" 
-               id="@users.user_id@">
+               mount_point="@mount_point;noquote@" 
+               id="@users.user_id;noquote@">
     </td>
     <td>
       <a href="one-user?id=@users.user_id@&mount_point=@mount_point@&parent_id=@id@">
@@ -108,7 +108,7 @@
     </td>
     <td>@users.screen_name@</td>
     <td>@users.email@</td>
-    <if @id@ not nil><td>@users.state_html@</td></if>
+    <if @id@ not nil><td>@users.state_html;noquote@</td></if>
     <if @admin_p@ eq t>
       <td><a href="@admin_url@@users.user_id@">Make Admin</a></td>
     </if>
@@ -130,9 +130,9 @@
 
 <if @perm_p@ eq t and @id@ nil>
   <include src="../permissions/index" 
-    object_id="@current_id@" 
-    mount_point="@mount_point@" 
-    return_url="@return_url@&mount_point=@mount_point@&id=@id@&parent_id=@parent_id@"
+    object_id="@current_id;noquote@" 
+    mount_point="@mount_point;noquote@" 
+    return_url="@return_url;noquote@&mount_point=@mount_point;noquote@&id=@id;noquote@&parent_id=@parent_id;noquote@"
   > 
 </if>
 
Index: openacs-4/packages/cms/www/modules/workflow/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/workflow/index.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/workflow/index.adp	12 Jun 2001 04:13:46 -0000	1.2
+++ openacs-4/packages/cms/www/modules/workflow/index.adp	22 May 2003 14:35:01 -0000	1.3
@@ -1,5 +1,5 @@
 <master src="../../master">
-<property name="title">@page_title@</property>
+<property name="title">@page_title;noquote@</property>
 
 <script language=javascript>
   top.treeFrame.setCurrentFolder('@mount_point@', '@id@', '@parent_id@');
Index: openacs-4/packages/cms/www/modules/workflow/overdue-items.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/workflow/overdue-items.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/workflow/overdue-items.adp	12 Jun 2001 04:13:46 -0000	1.2
+++ openacs-4/packages/cms/www/modules/workflow/overdue-items.adp	22 May 2003 14:35:01 -0000	1.3
@@ -1,5 +1,5 @@
 <master src="../../master">
-<property name="title">@page_title@</property>
+<property name="title">@page_title;noquote@</property>
 <h2>@page_title@</h2>
 <p>
 
Index: openacs-4/packages/cms/www/modules/workflow/task-finish.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/workflow/task-finish.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/workflow/task-finish.adp	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/workflow/task-finish.adp	22 May 2003 14:35:01 -0000	1.2
@@ -1,5 +1,5 @@
 <master src="../../master">
-<property name="title">@page_title@</property>
+<property name="title">@page_title;noquote@</property>
 
   <h2>@page_title@</h2>
   <formtemplate id="task_finish"></formtemplate>
Index: openacs-4/packages/cms/www/modules/workflow/task-start.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/workflow/task-start.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/modules/workflow/task-start.adp	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/cms/www/modules/workflow/task-start.adp	22 May 2003 14:35:01 -0000	1.2
@@ -1,5 +1,5 @@
 <master src="../../master">
-<property name="title">@page_title@</property>
+<property name="title">@page_title;noquote@</property>
 
   <h2>@page_title@</h2>
   <formtemplate id="task_start"></formtemplate>
Index: openacs-4/packages/cms/www/modules/workflow/user-tasks.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/workflow/user-tasks.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/workflow/user-tasks.adp	12 Jun 2001 04:13:46 -0000	1.2
+++ openacs-4/packages/cms/www/modules/workflow/user-tasks.adp	22 May 2003 14:35:01 -0000	1.3
@@ -1,5 +1,5 @@
 <master src="../../master">
-<property name="title">@page_title@</property>
+<property name="title">@page_title;noquote@</property>
 <h2>@page_title@</h2>
 <p>
 
Index: openacs-4/packages/cms/www/modules/workflow/workflow.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/modules/workflow/workflow.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/modules/workflow/workflow.adp	12 Jun 2001 04:13:46 -0000	1.2
+++ openacs-4/packages/cms/www/modules/workflow/workflow.adp	22 May 2003 14:35:01 -0000	1.3
@@ -1,5 +1,5 @@
 <master src="../../master">
-<property name="title">@page_title@</property>
+<property name="title">@page_title;noquote@</property>
 <h2>@page_title@</h2>
 <p>