Index: trunk/calendar3/deployment/webpublic/uportal2/resources/demoskins/MainCampus/default/default/default.xsl
===================================================================
--- trunk/calendar3/deployment/webpublic/uportal2/resources/demoskins/MainCampus/default/default/default.xsl (revision 622)
+++ trunk/calendar3/deployment/webpublic/uportal2/resources/demoskins/MainCampus/default/default/default.xsl (revision 625)
@@ -221,5 +221,5 @@
           <img alt="print this view" src="{$resourcesRoot}/images/std-print-icon.gif" width="20" height="14" border="0"/> print
         </a>
-        <a class="rss" href="{$setSelection}?setappvar=summaryMode(details)&amp;skinName=rss" title="RSS feed">RSS</a>
+        <a class="rss" href="{$setSelection}&amp;setappvar=summaryMode(details)&amp;skinName=rss" title="RSS feed">RSS</a>
       </td>
     </table>
@@ -234,8 +234,8 @@
               <xsl:choose>
                 <xsl:when test="/bedework/periodname='Day'">
-                  <a href="{$setViewPeriod}?viewType=dayView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-day-on.gif" width="91" height="20" border="0" alt="DAY"/></a>
+                  <a href="{$setViewPeriod}&amp;viewType=dayView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-day-on.gif" width="91" height="20" border="0" alt="DAY"/></a>
                 </xsl:when>
                 <xsl:otherwise>
-                  <a href="{$setViewPeriod}?viewType=dayView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-day-off.gif" width="91" height="20" border="0" alt="DAY"/></a>
+                  <a href="{$setViewPeriod}&amp;viewType=dayView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-day-off.gif" width="91" height="20" border="0" alt="DAY"/></a>
                 </xsl:otherwise>
               </xsl:choose>
@@ -244,8 +244,8 @@
               <xsl:choose>
                 <xsl:when test="/bedework/periodname='Week' or /bedework/periodname=''">
-                  <a href="{$setViewPeriod}?viewType=weekView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-week-on.gif" width="92" height="20" border="0" alt="WEEK"/></a>
+                  <a href="{$setViewPeriod}&amp;viewType=weekView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-week-on.gif" width="92" height="20" border="0" alt="WEEK"/></a>
                  </xsl:when>
                 <xsl:otherwise>
-                  <a href="{$setViewPeriod}?viewType=weekView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-week-off.gif" width="92" height="20" border="0" alt="WEEK"/></a>
+                  <a href="{$setViewPeriod}&amp;viewType=weekView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-week-off.gif" width="92" height="20" border="0" alt="WEEK"/></a>
                  </xsl:otherwise>
               </xsl:choose>
@@ -254,8 +254,8 @@
               <xsl:choose>
                 <xsl:when test="/bedework/periodname='Month'">
-                  <a href="{$setViewPeriod}?viewType=monthView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-month-on.gif" width="90" height="20" border="0" alt="MONTH"/></a>
+                  <a href="{$setViewPeriod}&amp;viewType=monthView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-month-on.gif" width="90" height="20" border="0" alt="MONTH"/></a>
                 </xsl:when>
                 <xsl:otherwise>
-                  <a href="{$setViewPeriod}?viewType=monthView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-month-off.gif" width="90" height="20" border="0" alt="MONTH"/></a>
+                  <a href="{$setViewPeriod}&amp;viewType=monthView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-month-off.gif" width="90" height="20" border="0" alt="MONTH"/></a>
                 </xsl:otherwise>
               </xsl:choose>
@@ -264,8 +264,8 @@
               <xsl:choose>
                 <xsl:when test="/bedework/periodname='Year'">
-                  <a href="{$setViewPeriod}?viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-year-on.gif" width="92" height="20" border="0" alt="YEAR"/></a>
+                  <a href="{$setViewPeriod}&amp;viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-year-on.gif" width="92" height="20" border="0" alt="YEAR"/></a>
                 </xsl:when>
                 <xsl:otherwise>
-                  <a href="{$setViewPeriod}?viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-year-off.gif" width="92" height="20" border="0" alt="YEAR"/></a>
+                  <a href="{$setViewPeriod}&amp;viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-year-off.gif" width="92" height="20" border="0" alt="YEAR"/></a>
                 </xsl:otherwise>
               </xsl:choose>
@@ -284,14 +284,14 @@
           <tr>
             <td>
-              <a href="{$setViewPeriod}?viewType=dayView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-day-off.gif" width="91" height="20" border="0" alt="DAY"/></a>
+              <a href="{$setViewPeriod}&amp;viewType=dayView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-day-off.gif" width="91" height="20" border="0" alt="DAY"/></a>
             </td>
             <td>
-              <a href="{$setViewPeriod}?viewType=weekView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-week-off.gif" width="92" height="20" border="0" alt="WEEK"/></a>
+              <a href="{$setViewPeriod}&amp;viewType=weekView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-week-off.gif" width="92" height="20" border="0" alt="WEEK"/></a>
             </td>
             <td>
-              <a href="{$setViewPeriod}?viewType=monthView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-month-off.gif" width="90" height="20" border="0" alt="MONTH"/></a>
+              <a href="{$setViewPeriod}&amp;viewType=monthView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-month-off.gif" width="90" height="20" border="0" alt="MONTH"/></a>
             </td>
             <td>
-              <a href="{$setViewPeriod}?viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-year-off.gif" width="92" height="20" border="0" alt="YEAR"/></a>
+              <a href="{$setViewPeriod}&amp;viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-year-off.gif" width="92" height="20" border="0" alt="YEAR"/></a>
             </td>
             <td class="centerCell">
@@ -311,6 +311,6 @@
       <tr>
         <td class="leftCell">
-          <a id="prevViewPeriod" href="{$setViewPeriod}?date={$prevdate}"><img src="{$resourcesRoot}/images/std-arrow-left.gif" alt="previous" width="13" height="16" class="prevImg" border="0"/></a>
-          <a id="nextViewPeriod" href="{$setViewPeriod}?date={$nextdate}"><img src="{$resourcesRoot}/images/std-arrow-right.gif" alt="next" width="13" height="16" class="nextImg" border="0"/></a>
+          <a id="prevViewPeriod" href="{$setViewPeriod}&amp;date={$prevdate}"><img src="{$resourcesRoot}/images/std-arrow-left.gif" alt="previous" width="13" height="16" class="prevImg" border="0"/></a>
+          <a id="nextViewPeriod" href="{$setViewPeriod}&amp;date={$nextdate}"><img src="{$resourcesRoot}/images/std-arrow-right.gif" alt="next" width="13" height="16" class="nextImg" border="0"/></a>
           <xsl:choose>
             <xsl:when test="/bedework/periodname='Year'">
@@ -329,5 +329,5 @@
         </td>
         <td class="todayButton">
-          <a href="{$setViewPeriod}?viewType=todayView&amp;date={$curdate}">
+          <a href="{$setViewPeriod}&amp;viewType=todayView&amp;date={$curdate}">
             <img src="{$resourcesRoot}/images/std-button-today-off.gif" width="54" height="22" border="0" alt="Go to Today" align="left"/>
           </a>
@@ -451,10 +451,10 @@
                 <xsl:choose>
                   <xsl:when test="/bedework/appvar[key='monthViewMode']/value='list'">
-                    <a href="{$setup}?setappvar=monthViewMode(cal)" title="toggle list/calendar view">
+                    <a href="{$setup}&amp;setappvar=monthViewMode(cal)" title="toggle list/calendar view">
                       <img src="{$resourcesRoot}/images/std-button-calview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/>
                     </a>
                   </xsl:when>
                   <xsl:otherwise>
-                    <a href="{$setup}?setappvar=monthViewMode(list)" title="toggle list/calendar view">
+                    <a href="{$setup}&amp;setappvar=monthViewMode(list)" title="toggle list/calendar view">
                       <img src="{$resourcesRoot}/images/std-button-listview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/>
                     </a>
@@ -465,10 +465,10 @@
                 <xsl:choose>
                   <xsl:when test="/bedework/appvar[key='weekViewMode']/value='list'">
-                    <a href="{$setup}?setappvar=weekViewMode(cal)" title="toggle list/calendar view">
+                    <a href="{$setup}&amp;setappvar=weekViewMode(cal)" title="toggle list/calendar view">
                       <img src="{$resourcesRoot}/images/std-button-calview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/>
                     </a>
                   </xsl:when>
                   <xsl:otherwise>
-                    <a href="{$setup}?setappvar=weekViewMode(list)" title="toggle list/calendar view">
+                    <a href="{$setup}&amp;setappvar=weekViewMode(list)" title="toggle list/calendar view">
                       <img src="{$resourcesRoot}/images/std-button-listview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/>
                     </a>
@@ -497,10 +497,10 @@
                 <xsl:choose>
                   <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'">
-                    <a href="{$setup}?setappvar=summaryMode(summary)" title="toggle summary/detailed view">
+                    <a href="{$setup}&amp;setappvar=summaryMode(summary)" title="toggle summary/detailed view">
                       <img src="{$resourcesRoot}/images/std-button-summary.gif" width="62" height="21" border="0" alt="toggle summary/detailed view"/>
                     </a>
                   </xsl:when>
                   <xsl:otherwise>
-                    <a href="{$setup}?setappvar=summaryMode(details)" title="toggle summary/detailed view">
+                    <a href="{$setup}&amp;setappvar=summaryMode(details)" title="toggle summary/detailed view">
                       <img src="{$resourcesRoot}/images/std-button-details.gif" width="62" height="21" border="0" alt="toggle summary/detailed view"/>
                     </a>
@@ -574,5 +574,5 @@
             add to my calendar</a>
             <xsl:variable name="eventIcalName" select="concat($id,'.ics')"/>
-            <a href="{$export}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars">
+            <a href="{$export}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars">
               <img src="{$resourcesRoot}/images/std-ical_icon.gif" width="20" height="26" border="0" alt="Download this event"/>
              download</a>
@@ -656,5 +656,5 @@
               <xsl:variable name="email" select="sponsor/email"/>
               <xsl:variable name="subject" select="summary"/>
-              <a href="mailto:{$email}?subject={$subject}">
+              <a href="mailto:{$email}&amp;subject={$subject}">
                 <xsl:value-of select="sponsor/email"/>
               </a>
@@ -667,5 +667,5 @@
         <td class="fieldval">
           <xsl:variable name="calUrl" select="calendar/path"/>
-          <a href="{$setSelection}?calUrl={$calUrl}">
+          <a href="{$setSelection}&amp;calUrl={$calUrl}">
             <xsl:value-of select="calendar/name"/>
           </a>
@@ -692,5 +692,5 @@
                 <td colspan="5" class="dateRow">
                    <xsl:variable name="date" select="date"/>
-                   <a href="{$setViewPeriod}?viewType=dayView&amp;date={$date}">
+                   <a href="{$setViewPeriod}&amp;viewType=dayView&amp;date={$date}">
                      <xsl:value-of select="name"/>, <xsl:value-of select="longdate"/>
                    </a>
@@ -822,5 +822,5 @@
                   </a>
                   <xsl:variable name="eventIcalName" select="concat($id,'.ics')"/>
-                  <a href="{$export}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars">
+                  <a href="{$export}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars">
                     <img src="{$resourcesRoot}/images/std-ical_icon_small.gif" width="12" height="16" border="0" alt="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"/>
                   </a>
@@ -848,5 +848,5 @@
             <td>
               <xsl:variable name="dayDate" select="date"/>
-              <a href="{$setViewPeriod}?viewType=dayView&amp;date={$dayDate}" class="dayLink">
+              <a href="{$setViewPeriod}&amp;viewType=dayView&amp;date={$dayDate}" class="dayLink">
                 <xsl:value-of select="value"/>
               </a>
@@ -882,5 +882,5 @@
                 <td>
                   <xsl:variable name="dayDate" select="date"/>
-                  <a href="{$setViewPeriod}?viewType=dayView&amp;date={$dayDate}" class="dayLink">
+                  <a href="{$setViewPeriod}&amp;viewType=dayView&amp;date={$dayDate}" class="dayLink">
                     <xsl:value-of select="value"/>
                   </a>
@@ -976,5 +976,5 @@
           <td colspan="8" class="monthName">
             <xsl:variable name="firstDayOfMonth" select="week/day/date"/>
-            <a href="{$setViewPeriod}?viewType=monthView&amp;date={$firstDayOfMonth}">
+            <a href="{$setViewPeriod}&amp;viewType=monthView&amp;date={$firstDayOfMonth}">
               <xsl:value-of select="longname"/>
             </a>
@@ -991,5 +991,5 @@
             <td class="weekCell">
               <xsl:variable name="firstDayOfWeek" select="day/date"/>
-              <a href="{$setViewPeriod}?viewType=weekView&amp;date={$firstDayOfWeek}">
+              <a href="{$setViewPeriod}&amp;viewType=weekView&amp;date={$firstDayOfWeek}">
                 <xsl:value-of select="value"/>
               </a>
@@ -1003,5 +1003,5 @@
                   <td>
                     <xsl:variable name="dayDate" select="date"/>
-                    <a href="{$setViewPeriod}?viewType=dayView&amp;date={$dayDate}">
+                    <a href="{$setViewPeriod}&amp;viewType=dayView&amp;date={$dayDate}">
                       <xsl:value-of select="value"/>
                     </a>
@@ -1054,5 +1054,5 @@
     <xsl:variable name="url" select="path"/>
     <li class="{$itemClass}">
-      <a href="{$setSelection}?calUrl={$url}"><xsl:value-of select="name"/></a>
+      <a href="{$setSelection}&amp;calUrl={$url}"><xsl:value-of select="name"/></a>
       <xsl:if test="calendar">
         <ul>
Index: trunk/calendar3/deployment/webpublic/uportal2/resources/demoskins/SoEDepartmental/default/default/soe.xsl
===================================================================
--- trunk/calendar3/deployment/webpublic/uportal2/resources/demoskins/SoEDepartmental/default/default/soe.xsl (revision 616)
+++ trunk/calendar3/deployment/webpublic/uportal2/resources/demoskins/SoEDepartmental/default/default/soe.xsl (revision 625)
@@ -239,5 +239,5 @@
           <img alt="print this view" src="{$resourcesRoot}/images/std-print-icon.gif" width="20" height="14" border="0"/> print
         </a>
-        <a class="rss" href="{$setSelection}?setappvar=summaryMode(details)&amp;skinName=rss" title="RSS feed">RSS</a>
+        <a class="rss" href="{$setSelection}&amp;setappvar=summaryMode(details)&amp;skinName=rss" title="RSS feed">RSS</a>
       </td>
     </table>-->
@@ -252,8 +252,8 @@
               <xsl:choose>
                 <xsl:when test="/bedework/periodname='Day'">
-                  <a href="{$setViewPeriod}?viewType=dayView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-day-on.gif" width="91" height="20" border="0" alt="DAY"/></a>
+                  <a href="{$setViewPeriod}&amp;viewType=dayView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-day-on.gif" width="91" height="20" border="0" alt="DAY"/></a>
                 </xsl:when>
                 <xsl:otherwise>
-                  <a href="{$setViewPeriod}?viewType=dayView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-day-off.gif" width="91" height="20" border="0" alt="DAY"/></a>
+                  <a href="{$setViewPeriod}&amp;viewType=dayView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-day-off.gif" width="91" height="20" border="0" alt="DAY"/></a>
                 </xsl:otherwise>
               </xsl:choose>
@@ -262,8 +262,8 @@
               <xsl:choose>
                 <xsl:when test="/bedework/periodname='Week' or /bedework/periodname=''">
-                  <a href="{$setViewPeriod}?viewType=weekView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-week-on.gif" width="92" height="20" border="0" alt="WEEK"/></a>
+                  <a href="{$setViewPeriod}&amp;viewType=weekView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-week-on.gif" width="92" height="20" border="0" alt="WEEK"/></a>
                  </xsl:when>
                 <xsl:otherwise>
-                  <a href="{$setViewPeriod}?viewType=weekView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-week-off.gif" width="92" height="20" border="0" alt="WEEK"/></a>
+                  <a href="{$setViewPeriod}&amp;viewType=weekView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-week-off.gif" width="92" height="20" border="0" alt="WEEK"/></a>
                  </xsl:otherwise>
               </xsl:choose>
@@ -272,8 +272,8 @@
               <xsl:choose>
                 <xsl:when test="/bedework/periodname='Month'">
-                  <a href="{$setViewPeriod}?viewType=monthView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-month-on.gif" width="90" height="20" border="0" alt="MONTH"/></a>
+                  <a href="{$setViewPeriod}&amp;viewType=monthView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-month-on.gif" width="90" height="20" border="0" alt="MONTH"/></a>
                 </xsl:when>
                 <xsl:otherwise>
-                  <a href="{$setViewPeriod}?viewType=monthView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-month-off.gif" width="90" height="20" border="0" alt="MONTH"/></a>
+                  <a href="{$setViewPeriod}&amp;viewType=monthView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-month-off.gif" width="90" height="20" border="0" alt="MONTH"/></a>
                 </xsl:otherwise>
               </xsl:choose>
@@ -282,8 +282,8 @@
               <xsl:choose>
                 <xsl:when test="/bedework/periodname='Year'">
-                  <a href="{$setViewPeriod}?viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-year-on.gif" width="92" height="20" border="0" alt="YEAR"/></a>
+                  <a href="{$setViewPeriod}&amp;viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-year-on.gif" width="92" height="20" border="0" alt="YEAR"/></a>
                 </xsl:when>
                 <xsl:otherwise>
-                  <a href="{$setViewPeriod}?viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-year-off.gif" width="92" height="20" border="0" alt="YEAR"/></a>
+                  <a href="{$setViewPeriod}&amp;viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-year-off.gif" width="92" height="20" border="0" alt="YEAR"/></a>
                 </xsl:otherwise>
               </xsl:choose>
@@ -293,5 +293,5 @@
                 <img alt="print this view" src="{$resourcesRoot}/images/std-print-icon.gif" width="20" height="14" border="0"/> print
               </a>
-              <a class="rss" href="{$setSelection}?setappvar=summaryMode(details)&amp;skinName=rss" title="RSS feed">RSS</a>
+              <a class="rss" href="{$setSelection}&amp;setappvar=summaryMode(details)&amp;skinName=rss" title="RSS feed">RSS</a>
             </td>
           </tr>
@@ -302,14 +302,14 @@
           <tr>
             <td>
-              <a href="{$setViewPeriod}?viewType=dayView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-day-off.gif" width="91" height="20" border="0" alt="DAY"/></a>
+              <a href="{$setViewPeriod}&amp;viewType=dayView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-day-off.gif" width="91" height="20" border="0" alt="DAY"/></a>
             </td>
             <td>
-              <a href="{$setViewPeriod}?viewType=weekView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-week-off.gif" width="92" height="20" border="0" alt="WEEK"/></a>
+              <a href="{$setViewPeriod}&amp;viewType=weekView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-week-off.gif" width="92" height="20" border="0" alt="WEEK"/></a>
             </td>
             <td>
-              <a href="{$setViewPeriod}?viewType=monthView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-month-off.gif" width="90" height="20" border="0" alt="MONTH"/></a>
+              <a href="{$setViewPeriod}&amp;viewType=monthView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-month-off.gif" width="90" height="20" border="0" alt="MONTH"/></a>
             </td>
             <td>
-              <a href="{$setViewPeriod}?viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-year-off.gif" width="92" height="20" border="0" alt="YEAR"/></a>
+              <a href="{$setViewPeriod}&amp;viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-year-off.gif" width="92" height="20" border="0" alt="YEAR"/></a>
             </td>
             <td class="rssPrint">
@@ -317,5 +317,5 @@
                 <img alt="print this view" src="{$resourcesRoot}/images/std-print-icon.gif" width="20" height="14" border="0"/> print
               </a>
-              <a class="rss" href="{$setSelection}?setappvar=summaryMode(details)&amp;skinName=rss" title="RSS feed">RSS</a>
+              <a class="rss" href="{$setSelection}&amp;setappvar=summaryMode(details)&amp;skinName=rss" title="RSS feed">RSS</a>
             </td>
           </tr>
@@ -329,6 +329,6 @@
       <tr>
         <td class="leftCell">
-          <a id="prevViewPeriod" href="{$setViewPeriod}?date={$prevdate}"><img src="{$resourcesRoot}/images/std-arrow-left.gif" alt="previous" width="13" height="16" class="prevImg" border="0"/></a>
-          <a id="nextViewPeriod" href="{$setViewPeriod}?date={$nextdate}"><img src="{$resourcesRoot}/images/std-arrow-right.gif" alt="next" width="13" height="16" class="nextImg" border="0"/></a>
+          <a id="prevViewPeriod" href="{$setViewPeriod}&amp;date={$prevdate}"><img src="{$resourcesRoot}/images/std-arrow-left.gif" alt="previous" width="13" height="16" class="prevImg" border="0"/></a>
+          <a id="nextViewPeriod" href="{$setViewPeriod}&amp;date={$nextdate}"><img src="{$resourcesRoot}/images/std-arrow-right.gif" alt="next" width="13" height="16" class="nextImg" border="0"/></a>
           <xsl:choose>
             <xsl:when test="/bedework/periodname='Year'">
@@ -347,5 +347,5 @@
         </td>
         <td class="todayButton">
-          <a href="{$setViewPeriod}?viewType=todayView&amp;date={$curdate}">
+          <a href="{$setViewPeriod}&amp;viewType=todayView&amp;date={$curdate}">
             <img src="{$resourcesRoot}/images/std-button-today-off.gif" width="54" height="22" border="0" alt="Go to Today" align="left"/>
           </a>
@@ -469,10 +469,10 @@
                 <xsl:choose>
                   <xsl:when test="/bedework/appvar[key='monthViewMode']/value='list'">
-                    <a href="{$setup}?setappvar=monthViewMode(cal)" title="toggle list/calendar view">
+                    <a href="{$setup}&amp;setappvar=monthViewMode(cal)" title="toggle list/calendar view">
                       <img src="{$resourcesRoot}/images/std-button-calview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/>
                     </a>
                   </xsl:when>
                   <xsl:otherwise>
-                    <a href="{$setup}?setappvar=monthViewMode(list)" title="toggle list/calendar view">
+                    <a href="{$setup}&amp;setappvar=monthViewMode(list)" title="toggle list/calendar view">
                       <img src="{$resourcesRoot}/images/std-button-listview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/>
                     </a>
@@ -483,10 +483,10 @@
                 <xsl:choose>
                   <xsl:when test="/bedework/appvar[key='weekViewMode']/value='cal'">
-                    <a href="{$setup}?setappvar=weekViewMode(list)" title="toggle list/calendar view">
+                    <a href="{$setup}&amp;setappvar=weekViewMode(list)" title="toggle list/calendar view">
                       <img src="{$resourcesRoot}/images/std-button-listview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/>
                     </a>
                   </xsl:when>
                   <xsl:otherwise>
-                    <a href="{$setup}?setappvar=weekViewMode(cal)" title="toggle list/calendar view">
+                    <a href="{$setup}&amp;setappvar=weekViewMode(cal)" title="toggle list/calendar view">
                       <img src="{$resourcesRoot}/images/std-button-calview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/>
                     </a>
@@ -515,10 +515,10 @@
                 <xsl:choose>
                   <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'">
-                    <a href="{$setup}?setappvar=summaryMode(summary)" title="toggle summary/detailed view">
+                    <a href="{$setup}&amp;setappvar=summaryMode(summary)" title="toggle summary/detailed view">
                       <img src="{$resourcesRoot}/images/std-button-summary.gif" width="62" height="21" border="0" alt="toggle summary/detailed view"/>
                     </a>
                   </xsl:when>
                   <xsl:otherwise>
-                    <a href="{$setup}?setappvar=summaryMode(details)" title="toggle summary/detailed view">
+                    <a href="{$setup}&amp;setappvar=summaryMode(details)" title="toggle summary/detailed view">
                       <img src="{$resourcesRoot}/images/std-button-details.gif" width="62" height="21" border="0" alt="toggle summary/detailed view"/>
                     </a>
@@ -592,5 +592,5 @@
 						add to my calendar</a>
 						<xsl:variable name="eventIcalName" select="concat($id,'.ics')"/>
-						<a href="{$export}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars">
+						<a href="{$export}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars">
 							<img src="{$resourcesRoot}/images/std-ical_icon.gif" width="20" height="26" border="0" alt="Download this event"/>
 						 download</a>
@@ -674,5 +674,5 @@
               <xsl:variable name="email" select="sponsor/email"/>
               <xsl:variable name="subject" select="summary"/>
-              <a href="mailto:{$email}?subject={$subject}">
+              <a href="mailto:{$email}&amp;subject={$subject}">
                 <xsl:value-of select="sponsor/email"/>
               </a>
@@ -685,5 +685,5 @@
         <td class="fieldval">
           <xsl:variable name="calUrl" select="calendar/path"/>
-          <a href="{$setSelection}?calUrl={$calUrl}">
+          <a href="{$setSelection}&amp;calUrl={$calUrl}">
             <xsl:value-of select="calendar/name"/>
           </a>
@@ -710,5 +710,5 @@
                 <td colspan="5" class="dateRow">
                    <xsl:variable name="date" select="date"/>
-                   <a href="{$setViewPeriod}?viewType=dayView&amp;date={$date}">
+                   <a href="{$setViewPeriod}&amp;viewType=dayView&amp;date={$date}">
                      <xsl:value-of select="name"/>, <xsl:value-of select="longdate"/>
                    </a>
@@ -747,5 +747,5 @@
                                   start/time = end/time">
                     <td class="{$dateRangeStyle} center" colspan="3">
-                      <a href="{$eventView}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">
+                      <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">
                         <xsl:value-of select="start/time"/>
                       </a>
@@ -754,5 +754,5 @@
                   <xsl:otherwise>
                     <td class="{$dateRangeStyle} right">
-                      <a href="{$eventView}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">
+                      <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">
                       <xsl:choose>
                         <xsl:when test="start/allday = 'true' and
@@ -771,8 +771,8 @@
                     </td>
                     <td class="{$dateRangeStyle} center">
-                      <a href="{$eventView}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">-</a>
+                      <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">-</a>
                     </td>
                     <td class="{$dateRangeStyle} left">
-                      <a href="{$eventView}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">
+                      <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">
                       <xsl:choose>
                         <xsl:when test="end/allday = 'true' and
@@ -803,5 +803,5 @@
                   <xsl:choose>
                     <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'">
-                      <a href="{$eventView}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">
+                      <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">
                         <strong>
                           <xsl:value-of select="summary"/>:
@@ -827,5 +827,5 @@
                     </xsl:when>
                     <xsl:otherwise>
-                      <a href="{$eventView}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">
+                      <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">
                         <xsl:value-of select="summary"/>
                         <xsl:if test="location/address != ''">, <xsl:value-of select="location/address"/></xsl:if>
@@ -840,5 +840,5 @@
                   </a>
                   <xsl:variable name="eventIcalName" select="concat($id,'.ics')"/>
-                  <a href="{$export}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars">
+                  <a href="{$export}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars">
                     <img src="{$resourcesRoot}/images/std-ical_icon_small.gif" width="12" height="16" border="0" alt="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"/>
                   </a>
@@ -866,5 +866,5 @@
             <td>
               <xsl:variable name="dayDate" select="date"/>
-              <a href="{$setViewPeriod}?viewType=dayView&amp;date={$dayDate}" class="dayLink">
+              <a href="{$setViewPeriod}&amp;viewType=dayView&amp;date={$dayDate}" class="dayLink">
                 <xsl:value-of select="value"/>
               </a>
@@ -900,5 +900,5 @@
                 <td>
                   <xsl:variable name="dayDate" select="date"/>
-                  <a href="{$setViewPeriod}?viewType=dayView&amp;date={$dayDate}" class="dayLink">
+                  <a href="{$setViewPeriod}&amp;viewType=dayView&amp;date={$dayDate}" class="dayLink">
                     <xsl:value-of select="value"/>
                   </a>
@@ -935,5 +935,5 @@
     </xsl:variable>
     <li>
-      <a href="{$eventView}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" class="{$eventClass}">
+      <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" class="{$eventClass}">
         <xsl:if test="status='CANCELLED'">CANCELLED: </xsl:if>
         <xsl:value-of select="summary"/>
@@ -994,5 +994,5 @@
           <td colspan="8" class="monthName">
             <xsl:variable name="firstDayOfMonth" select="week/day/date"/>
-            <a href="{$setViewPeriod}?viewType=monthView&amp;date={$firstDayOfMonth}">
+            <a href="{$setViewPeriod}&amp;viewType=monthView&amp;date={$firstDayOfMonth}">
               <xsl:value-of select="longname"/>
             </a>
@@ -1009,5 +1009,5 @@
             <td class="weekCell">
               <xsl:variable name="firstDayOfWeek" select="day/date"/>
-              <a href="{$setViewPeriod}?viewType=weekView&amp;date={$firstDayOfWeek}">
+              <a href="{$setViewPeriod}&amp;viewType=weekView&amp;date={$firstDayOfWeek}">
                 <xsl:value-of select="value"/>
               </a>
@@ -1021,5 +1021,5 @@
                   <td>
                     <xsl:variable name="dayDate" select="date"/>
-                    <a href="{$setViewPeriod}?viewType=dayView&amp;date={$dayDate}">
+                    <a href="{$setViewPeriod}&amp;viewType=dayView&amp;date={$dayDate}">
                       <xsl:value-of select="value"/>
                     </a>
@@ -1072,5 +1072,5 @@
     <xsl:variable name="url" select="path"/>
     <li class="{$itemClass}">
-      <a href="{$setSelection}?calUrl={$url}"><xsl:value-of select="name"/></a>
+      <a href="{$setSelection}&amp;calUrl={$url}"><xsl:value-of select="name"/></a>
       <xsl:if test="calendar">
         <ul>
Index: trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl
===================================================================
--- trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/default/default/default.xsl (revision 598)
+++ trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/default/default.xsl (revision 625)
@@ -233,5 +233,5 @@
           <img alt="print this view" src="{$resourcesRoot}/images/std-print-icon.gif" width="20" height="14" border="0"/> print
         </a>
-        <a class="rss" href="{$setSelection}?setappvar=summaryMode(details)&amp;skinName=rss" title="RSS feed">RSS</a>
+        <a class="rss" href="{$setSelection}&amp;setappvar=summaryMode(details)&amp;skinName=rss" title="RSS feed">RSS</a>
       </td>
     </table>
@@ -246,8 +246,8 @@
               <xsl:choose>
                 <xsl:when test="/bedework/periodname='Day'">
-                  <a href="{$setViewPeriod}?viewType=dayView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-day-on.gif" width="91" height="20" border="0" alt="DAY"/></a>
+                  <a href="{$setViewPeriod}&amp;viewType=dayView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-day-on.gif" width="91" height="20" border="0" alt="DAY"/></a>
                 </xsl:when>
                 <xsl:otherwise>
-                  <a href="{$setViewPeriod}?viewType=dayView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-day-off.gif" width="91" height="20" border="0" alt="DAY"/></a>
+                  <a href="{$setViewPeriod}&amp;viewType=dayView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-day-off.gif" width="91" height="20" border="0" alt="DAY"/></a>
                 </xsl:otherwise>
               </xsl:choose>
@@ -256,8 +256,8 @@
               <xsl:choose>
                 <xsl:when test="/bedework/periodname='Week' or /bedework/periodname=''">
-                  <a href="{$setViewPeriod}?viewType=weekView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-week-on.gif" width="92" height="20" border="0" alt="WEEK"/></a>
+                  <a href="{$setViewPeriod}&amp;viewType=weekView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-week-on.gif" width="92" height="20" border="0" alt="WEEK"/></a>
                  </xsl:when>
                 <xsl:otherwise>
-                  <a href="{$setViewPeriod}?viewType=weekView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-week-off.gif" width="92" height="20" border="0" alt="WEEK"/></a>
+                  <a href="{$setViewPeriod}&amp;viewType=weekView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-week-off.gif" width="92" height="20" border="0" alt="WEEK"/></a>
                  </xsl:otherwise>
               </xsl:choose>
@@ -266,8 +266,8 @@
               <xsl:choose>
                 <xsl:when test="/bedework/periodname='Month'">
-                  <a href="{$setViewPeriod}?viewType=monthView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-month-on.gif" width="90" height="20" border="0" alt="MONTH"/></a>
+                  <a href="{$setViewPeriod}&amp;viewType=monthView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-month-on.gif" width="90" height="20" border="0" alt="MONTH"/></a>
                 </xsl:when>
                 <xsl:otherwise>
-                  <a href="{$setViewPeriod}?viewType=monthView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-month-off.gif" width="90" height="20" border="0" alt="MONTH"/></a>
+                  <a href="{$setViewPeriod}&amp;viewType=monthView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-month-off.gif" width="90" height="20" border="0" alt="MONTH"/></a>
                 </xsl:otherwise>
               </xsl:choose>
@@ -276,8 +276,8 @@
               <xsl:choose>
                 <xsl:when test="/bedework/periodname='Year'">
-                  <a href="{$setViewPeriod}?viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-year-on.gif" width="92" height="20" border="0" alt="YEAR"/></a>
+                  <a href="{$setViewPeriod}&amp;viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-year-on.gif" width="92" height="20" border="0" alt="YEAR"/></a>
                 </xsl:when>
                 <xsl:otherwise>
-                  <a href="{$setViewPeriod}?viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-year-off.gif" width="92" height="20" border="0" alt="YEAR"/></a>
+                  <a href="{$setViewPeriod}&amp;viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-year-off.gif" width="92" height="20" border="0" alt="YEAR"/></a>
                 </xsl:otherwise>
               </xsl:choose>
@@ -296,14 +296,14 @@
           <tr>
             <td>
-              <a href="{$setViewPeriod}?viewType=dayView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-day-off.gif" width="91" height="20" border="0" alt="DAY"/></a>
+              <a href="{$setViewPeriod}&amp;viewType=dayView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-day-off.gif" width="91" height="20" border="0" alt="DAY"/></a>
             </td>
             <td>
-              <a href="{$setViewPeriod}?viewType=weekView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-week-off.gif" width="92" height="20" border="0" alt="WEEK"/></a>
+              <a href="{$setViewPeriod}&amp;viewType=weekView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-week-off.gif" width="92" height="20" border="0" alt="WEEK"/></a>
             </td>
             <td>
-              <a href="{$setViewPeriod}?viewType=monthView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-month-off.gif" width="90" height="20" border="0" alt="MONTH"/></a>
+              <a href="{$setViewPeriod}&amp;viewType=monthView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-month-off.gif" width="90" height="20" border="0" alt="MONTH"/></a>
             </td>
             <td>
-              <a href="{$setViewPeriod}?viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-year-off.gif" width="92" height="20" border="0" alt="YEAR"/></a>
+              <a href="{$setViewPeriod}&amp;viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-year-off.gif" width="92" height="20" border="0" alt="YEAR"/></a>
             </td>
             <td class="centerCell">
@@ -323,6 +323,6 @@
       <tr>
         <td class="leftCell">
-          <a id="prevViewPeriod" href="{$setViewPeriod}?date={$prevdate}"><img src="{$resourcesRoot}/images/std-arrow-left.gif" alt="previous" width="13" height="16" class="prevImg" border="0"/></a>
-          <a id="nextViewPeriod" href="{$setViewPeriod}?date={$nextdate}"><img src="{$resourcesRoot}/images/std-arrow-right.gif" alt="next" width="13" height="16" class="nextImg" border="0"/></a>
+          <a id="prevViewPeriod" href="{$setViewPeriod}&amp;date={$prevdate}"><img src="{$resourcesRoot}/images/std-arrow-left.gif" alt="previous" width="13" height="16" class="prevImg" border="0"/></a>
+          <a id="nextViewPeriod" href="{$setViewPeriod}&amp;date={$nextdate}"><img src="{$resourcesRoot}/images/std-arrow-right.gif" alt="next" width="13" height="16" class="nextImg" border="0"/></a>
           <xsl:choose>
             <xsl:when test="/bedework/periodname='Year'">
@@ -341,5 +341,5 @@
         </td>
         <td class="todayButton">
-          <a href="{$setViewPeriod}?viewType=todayView&amp;date={$curdate}">
+          <a href="{$setViewPeriod}&amp;viewType=todayView&amp;date={$curdate}">
             <img src="{$resourcesRoot}/images/std-button-today-off.gif" width="54" height="22" border="0" alt="Go to Today" align="left"/>
           </a>
@@ -463,10 +463,10 @@
                 <xsl:choose>
                   <xsl:when test="/bedework/appvar[key='monthViewMode']/value='list'">
-                    <a href="{$setup}?setappvar=monthViewMode(cal)" title="toggle list/calendar view">
+                    <a href="{$setup}&amp;setappvar=monthViewMode(cal)" title="toggle list/calendar view">
                       <img src="{$resourcesRoot}/images/std-button-calview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/>
                     </a>
                   </xsl:when>
                   <xsl:otherwise>
-                    <a href="{$setup}?setappvar=monthViewMode(list)" title="toggle list/calendar view">
+                    <a href="{$setup}&amp;setappvar=monthViewMode(list)" title="toggle list/calendar view">
                       <img src="{$resourcesRoot}/images/std-button-listview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/>
                     </a>
@@ -477,10 +477,10 @@
                 <xsl:choose>
                   <xsl:when test="/bedework/appvar[key='weekViewMode']/value='list'">
-                    <a href="{$setup}?setappvar=weekViewMode(cal)" title="toggle list/calendar view">
+                    <a href="{$setup}&amp;setappvar=weekViewMode(cal)" title="toggle list/calendar view">
                       <img src="{$resourcesRoot}/images/std-button-calview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/>
                     </a>
                   </xsl:when>
                   <xsl:otherwise>
-                    <a href="{$setup}?setappvar=weekViewMode(list)" title="toggle list/calendar view">
+                    <a href="{$setup}&amp;setappvar=weekViewMode(list)" title="toggle list/calendar view">
                       <img src="{$resourcesRoot}/images/std-button-listview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/>
                     </a>
@@ -509,10 +509,10 @@
                 <xsl:choose>
                   <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'">
-                    <a href="{$setup}?setappvar=summaryMode(summary)" title="toggle summary/detailed view">
+                    <a href="{$setup}&amp;setappvar=summaryMode(summary)" title="toggle summary/detailed view">
                       <img src="{$resourcesRoot}/images/std-button-summary.gif" width="62" height="21" border="0" alt="toggle summary/detailed view"/>
                     </a>
                   </xsl:when>
                   <xsl:otherwise>
-                    <a href="{$setup}?setappvar=summaryMode(details)" title="toggle summary/detailed view">
+                    <a href="{$setup}&amp;setappvar=summaryMode(details)" title="toggle summary/detailed view">
                       <img src="{$resourcesRoot}/images/std-button-details.gif" width="62" height="21" border="0" alt="toggle summary/detailed view"/>
                     </a>
@@ -586,5 +586,5 @@
             add to my calendar</a>
             <xsl:variable name="eventIcalName" select="concat($id,'.ics')"/>
-            <a href="{$export}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars">
+            <a href="{$export}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars">
               <img src="{$resourcesRoot}/images/std-ical_icon.gif" width="20" height="26" border="0" alt="Download this event"/>
              download</a>
@@ -668,5 +668,5 @@
               <xsl:variable name="email" select="sponsor/email"/>
               <xsl:variable name="subject" select="summary"/>
-              <a href="mailto:{$email}?subject={$subject}">
+              <a href="mailto:{$email}&amp;subject={$subject}">
                 <xsl:value-of select="sponsor/email"/>
               </a>
@@ -679,5 +679,5 @@
         <td class="fieldval">
           <xsl:variable name="calUrl" select="calendar/path"/>
-          <a href="{$setSelection}?calUrl={$calUrl}">
+          <a href="{$setSelection}&amp;calUrl={$calUrl}">
             <xsl:value-of select="calendar/name"/>
           </a>
@@ -704,5 +704,5 @@
                 <td colspan="5" class="dateRow">
                    <xsl:variable name="date" select="date"/>
-                   <a href="{$setViewPeriod}?viewType=dayView&amp;date={$date}">
+                   <a href="{$setViewPeriod}&amp;viewType=dayView&amp;date={$date}">
                      <xsl:value-of select="name"/>, <xsl:value-of select="longdate"/>
                    </a>
@@ -834,5 +834,5 @@
                   </a>
                   <xsl:variable name="eventIcalName" select="concat($id,'.ics')"/>
-                  <a href="{$export}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars">
+                  <a href="{$export}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars">
                     <img src="{$resourcesRoot}/images/std-ical_icon_small.gif" width="12" height="16" border="0" alt="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"/>
                   </a>
@@ -860,5 +860,5 @@
             <td>
               <xsl:variable name="dayDate" select="date"/>
-              <a href="{$setViewPeriod}?viewType=dayView&amp;date={$dayDate}" class="dayLink">
+              <a href="{$setViewPeriod}&amp;viewType=dayView&amp;date={$dayDate}" class="dayLink">
                 <xsl:value-of select="value"/>
               </a>
@@ -894,5 +894,5 @@
                 <td>
                   <xsl:variable name="dayDate" select="date"/>
-                  <a href="{$setViewPeriod}?viewType=dayView&amp;date={$dayDate}" class="dayLink">
+                  <a href="{$setViewPeriod}&amp;viewType=dayView&amp;date={$dayDate}" class="dayLink">
                     <xsl:value-of select="value"/>
                   </a>
@@ -988,5 +988,5 @@
           <td colspan="8" class="monthName">
             <xsl:variable name="firstDayOfMonth" select="week/day/date"/>
-            <a href="{$setViewPeriod}?viewType=monthView&amp;date={$firstDayOfMonth}">
+            <a href="{$setViewPeriod}&amp;viewType=monthView&amp;date={$firstDayOfMonth}">
               <xsl:value-of select="longname"/>
             </a>
@@ -1003,5 +1003,5 @@
             <td class="weekCell">
               <xsl:variable name="firstDayOfWeek" select="day/date"/>
-              <a href="{$setViewPeriod}?viewType=weekView&amp;date={$firstDayOfWeek}">
+              <a href="{$setViewPeriod}&amp;viewType=weekView&amp;date={$firstDayOfWeek}">
                 <xsl:value-of select="value"/>
               </a>
@@ -1015,5 +1015,5 @@
                   <td>
                     <xsl:variable name="dayDate" select="date"/>
-                    <a href="{$setViewPeriod}?viewType=dayView&amp;date={$dayDate}">
+                    <a href="{$setViewPeriod}&amp;viewType=dayView&amp;date={$dayDate}">
                       <xsl:value-of select="value"/>
                     </a>
@@ -1066,5 +1066,5 @@
     <xsl:variable name="url" select="path"/>
     <li class="{$itemClass}">
-      <a href="{$setSelection}?calUrl={$url}"><xsl:value-of select="name"/></a>
+      <a href="{$setSelection}&amp;calUrl={$url}"><xsl:value-of select="name"/></a>
       <xsl:if test="calendar">
         <ul>
@@ -1167,8 +1167,8 @@
             <select name="skinPicker" onchange="window.location = this.value">
               <option>example skins:</option>
-              <option value="{$setViewPeriod}?viewType=weekView&amp;skinName=rss&amp;setappvar=summaryMode(details)">rss feed</option>
-              <option value="{$setViewPeriod}?viewType=todayView&amp;skinName=jsToday&amp;contentType=text/javascript&amp;contentName=bedework.js">javascript feed</option>
-              <option value="{$setViewPeriod}?viewType=todayView&amp;skinName=videocal">video feed</option>
-              <option value="{$setup}?skinName=default">reset to calendar default</option>
+              <option value="{$setViewPeriod}&amp;viewType=weekView&amp;skinName=rss&amp;setappvar=summaryMode(details)">rss feed</option>
+              <option value="{$setViewPeriod}&amp;viewType=todayView&amp;skinName=jsToday&amp;contentType=text/javascript&amp;contentName=bedework.js">javascript feed</option>
+              <option value="{$setViewPeriod}&amp;viewType=todayView&amp;skinName=videocal">video feed</option>
+              <option value="{$setup}&amp;skinName=default">reset to calendar default</option>
             </select>
           </form>
Index: trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/soe.xsl
===================================================================
--- trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/soe.xsl (revision 619)
+++ trunk/calendar3/deployment/webpublic/webapp/resources/demoskins/SoEDepartmental/default/default/soe.xsl (revision 625)
@@ -238,5 +238,5 @@
           <img alt="print this view" src="{$resourcesRoot}/images/std-print-icon.gif" width="20" height="14" border="0"/> print
         </a>
-        <a class="rss" href="{$setSelection}?setappvar=summaryMode(details)&amp;skinName=rss" title="RSS feed">RSS</a>
+        <a class="rss" href="{$setSelection}&amp;setappvar=summaryMode(details)&amp;skinName=rss" title="RSS feed">RSS</a>
       </td>
     </table>-->
@@ -251,8 +251,8 @@
               <xsl:choose>
                 <xsl:when test="/bedework/periodname='Day'">
-                  <a href="{$setViewPeriod}?viewType=dayView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-day-on.gif" width="91" height="20" border="0" alt="DAY"/></a>
+                  <a href="{$setViewPeriod}&amp;viewType=dayView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-day-on.gif" width="91" height="20" border="0" alt="DAY"/></a>
                 </xsl:when>
                 <xsl:otherwise>
-                  <a href="{$setViewPeriod}?viewType=dayView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-day-off.gif" width="91" height="20" border="0" alt="DAY"/></a>
+                  <a href="{$setViewPeriod}&amp;viewType=dayView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-day-off.gif" width="91" height="20" border="0" alt="DAY"/></a>
                 </xsl:otherwise>
               </xsl:choose>
@@ -261,8 +261,8 @@
               <xsl:choose>
                 <xsl:when test="/bedework/periodname='Week' or /bedework/periodname=''">
-                  <a href="{$setViewPeriod}?viewType=weekView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-week-on.gif" width="92" height="20" border="0" alt="WEEK"/></a>
+                  <a href="{$setViewPeriod}&amp;viewType=weekView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-week-on.gif" width="92" height="20" border="0" alt="WEEK"/></a>
                  </xsl:when>
                 <xsl:otherwise>
-                  <a href="{$setViewPeriod}?viewType=weekView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-week-off.gif" width="92" height="20" border="0" alt="WEEK"/></a>
+                  <a href="{$setViewPeriod}&amp;viewType=weekView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-week-off.gif" width="92" height="20" border="0" alt="WEEK"/></a>
                  </xsl:otherwise>
               </xsl:choose>
@@ -271,8 +271,8 @@
               <xsl:choose>
                 <xsl:when test="/bedework/periodname='Month'">
-                  <a href="{$setViewPeriod}?viewType=monthView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-month-on.gif" width="90" height="20" border="0" alt="MONTH"/></a>
+                  <a href="{$setViewPeriod}&amp;viewType=monthView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-month-on.gif" width="90" height="20" border="0" alt="MONTH"/></a>
                 </xsl:when>
                 <xsl:otherwise>
-                  <a href="{$setViewPeriod}?viewType=monthView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-month-off.gif" width="90" height="20" border="0" alt="MONTH"/></a>
+                  <a href="{$setViewPeriod}&amp;viewType=monthView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-month-off.gif" width="90" height="20" border="0" alt="MONTH"/></a>
                 </xsl:otherwise>
               </xsl:choose>
@@ -281,8 +281,8 @@
               <xsl:choose>
                 <xsl:when test="/bedework/periodname='Year'">
-                  <a href="{$setViewPeriod}?viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-year-on.gif" width="92" height="20" border="0" alt="YEAR"/></a>
+                  <a href="{$setViewPeriod}&amp;viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-year-on.gif" width="92" height="20" border="0" alt="YEAR"/></a>
                 </xsl:when>
                 <xsl:otherwise>
-                  <a href="{$setViewPeriod}?viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-year-off.gif" width="92" height="20" border="0" alt="YEAR"/></a>
+                  <a href="{$setViewPeriod}&amp;viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-year-off.gif" width="92" height="20" border="0" alt="YEAR"/></a>
                 </xsl:otherwise>
               </xsl:choose>
@@ -292,5 +292,5 @@
                 <img alt="print this view" src="{$resourcesRoot}/images/std-print-icon.gif" width="20" height="14" border="0"/> print
               </a>
-              <a class="rss" href="{$setSelection}?setappvar=summaryMode(details)&amp;skinName=rss" title="RSS feed">RSS</a>
+              <a class="rss" href="{$setSelection}&amp;setappvar=summaryMode(details)&amp;skinName=rss" title="RSS feed">RSS</a>
             </td>
           </tr>
@@ -301,14 +301,14 @@
           <tr>
             <td>
-              <a href="{$setViewPeriod}?viewType=dayView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-day-off.gif" width="91" height="20" border="0" alt="DAY"/></a>
+              <a href="{$setViewPeriod}&amp;viewType=dayView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-day-off.gif" width="91" height="20" border="0" alt="DAY"/></a>
             </td>
             <td>
-              <a href="{$setViewPeriod}?viewType=weekView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-week-off.gif" width="92" height="20" border="0" alt="WEEK"/></a>
+              <a href="{$setViewPeriod}&amp;viewType=weekView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-week-off.gif" width="92" height="20" border="0" alt="WEEK"/></a>
             </td>
             <td>
-              <a href="{$setViewPeriod}?viewType=monthView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-month-off.gif" width="90" height="20" border="0" alt="MONTH"/></a>
+              <a href="{$setViewPeriod}&amp;viewType=monthView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-month-off.gif" width="90" height="20" border="0" alt="MONTH"/></a>
             </td>
             <td>
-              <a href="{$setViewPeriod}?viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-year-off.gif" width="92" height="20" border="0" alt="YEAR"/></a>
+              <a href="{$setViewPeriod}&amp;viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/images/std-tab-year-off.gif" width="92" height="20" border="0" alt="YEAR"/></a>
             </td>
             <td class="rssPrint">
@@ -316,5 +316,5 @@
                 <img alt="print this view" src="{$resourcesRoot}/images/std-print-icon.gif" width="20" height="14" border="0"/> print
               </a>
-              <a class="rss" href="{$setSelection}?setappvar=summaryMode(details)&amp;skinName=rss" title="RSS feed">RSS</a>
+              <a class="rss" href="{$setSelection}&amp;setappvar=summaryMode(details)&amp;skinName=rss" title="RSS feed">RSS</a>
             </td>
           </tr>
@@ -328,6 +328,6 @@
       <tr>
         <td class="leftCell">
-          <a id="prevViewPeriod" href="{$setViewPeriod}?date={$prevdate}"><img src="{$resourcesRoot}/images/std-arrow-left.gif" alt="previous" width="13" height="16" class="prevImg" border="0"/></a>
-          <a id="nextViewPeriod" href="{$setViewPeriod}?date={$nextdate}"><img src="{$resourcesRoot}/images/std-arrow-right.gif" alt="next" width="13" height="16" class="nextImg" border="0"/></a>
+          <a id="prevViewPeriod" href="{$setViewPeriod}&amp;date={$prevdate}"><img src="{$resourcesRoot}/images/std-arrow-left.gif" alt="previous" width="13" height="16" class="prevImg" border="0"/></a>
+          <a id="nextViewPeriod" href="{$setViewPeriod}&amp;date={$nextdate}"><img src="{$resourcesRoot}/images/std-arrow-right.gif" alt="next" width="13" height="16" class="nextImg" border="0"/></a>
           <xsl:choose>
             <xsl:when test="/bedework/periodname='Year'">
@@ -346,5 +346,5 @@
         </td>
         <td class="todayButton">
-          <a href="{$setViewPeriod}?viewType=todayView&amp;date={$curdate}">
+          <a href="{$setViewPeriod}&amp;viewType=todayView&amp;date={$curdate}">
             <img src="{$resourcesRoot}/images/std-button-today-off.gif" width="54" height="22" border="0" alt="Go to Today" align="left"/>
           </a>
@@ -468,10 +468,10 @@
                 <xsl:choose>
                   <xsl:when test="/bedework/appvar[key='monthViewMode']/value='list'">
-                    <a href="{$setup}?setappvar=monthViewMode(cal)" title="toggle list/calendar view">
+                    <a href="{$setup}&amp;setappvar=monthViewMode(cal)" title="toggle list/calendar view">
                       <img src="{$resourcesRoot}/images/std-button-calview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/>
                     </a>
                   </xsl:when>
                   <xsl:otherwise>
-                    <a href="{$setup}?setappvar=monthViewMode(list)" title="toggle list/calendar view">
+                    <a href="{$setup}&amp;setappvar=monthViewMode(list)" title="toggle list/calendar view">
                       <img src="{$resourcesRoot}/images/std-button-listview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/>
                     </a>
@@ -482,10 +482,10 @@
                 <xsl:choose>
                   <xsl:when test="/bedework/appvar[key='weekViewMode']/value='cal'">
-                    <a href="{$setup}?setappvar=weekViewMode(list)" title="toggle list/calendar view">
+                    <a href="{$setup}&amp;setappvar=weekViewMode(list)" title="toggle list/calendar view">
                       <img src="{$resourcesRoot}/images/std-button-listview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/>
                     </a>
                   </xsl:when>
                   <xsl:otherwise>
-                    <a href="{$setup}?setappvar=weekViewMode(cal)" title="toggle list/calendar view">
+                    <a href="{$setup}&amp;setappvar=weekViewMode(cal)" title="toggle list/calendar view">
                       <img src="{$resourcesRoot}/images/std-button-calview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/>
                     </a>
@@ -514,10 +514,10 @@
                 <xsl:choose>
                   <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'">
-                    <a href="{$setup}?setappvar=summaryMode(summary)" title="toggle summary/detailed view">
+                    <a href="{$setup}&amp;setappvar=summaryMode(summary)" title="toggle summary/detailed view">
                       <img src="{$resourcesRoot}/images/std-button-summary.gif" width="62" height="21" border="0" alt="toggle summary/detailed view"/>
                     </a>
                   </xsl:when>
                   <xsl:otherwise>
-                    <a href="{$setup}?setappvar=summaryMode(details)" title="toggle summary/detailed view">
+                    <a href="{$setup}&amp;setappvar=summaryMode(details)" title="toggle summary/detailed view">
                       <img src="{$resourcesRoot}/images/std-button-details.gif" width="62" height="21" border="0" alt="toggle summary/detailed view"/>
                     </a>
@@ -591,5 +591,5 @@
 						add to my calendar</a>
 						<xsl:variable name="eventIcalName" select="concat($id,'.ics')"/>
-						<a href="{$export}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars">
+						<a href="{$export}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars">
 							<img src="{$resourcesRoot}/images/std-ical_icon.gif" width="20" height="26" border="0" alt="Download this event"/>
 						 download</a>
@@ -673,5 +673,5 @@
               <xsl:variable name="email" select="sponsor/email"/>
               <xsl:variable name="subject" select="summary"/>
-              <a href="mailto:{$email}?subject={$subject}">
+              <a href="mailto:{$email}&amp;subject={$subject}">
                 <xsl:value-of select="sponsor/email"/>
               </a>
@@ -684,5 +684,5 @@
         <td class="fieldval">
           <xsl:variable name="calUrl" select="calendar/path"/>
-          <a href="{$setSelection}?calUrl={$calUrl}">
+          <a href="{$setSelection}&amp;calUrl={$calUrl}">
             <xsl:value-of select="calendar/name"/>
           </a>
@@ -709,5 +709,5 @@
                 <td colspan="5" class="dateRow">
                    <xsl:variable name="date" select="date"/>
-                   <a href="{$setViewPeriod}?viewType=dayView&amp;date={$date}">
+                   <a href="{$setViewPeriod}&amp;viewType=dayView&amp;date={$date}">
                      <xsl:value-of select="name"/>, <xsl:value-of select="longdate"/>
                    </a>
@@ -746,5 +746,5 @@
                                   start/time = end/time">
                     <td class="{$dateRangeStyle} center" colspan="3">
-                      <a href="{$eventView}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">
+                      <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">
                         <xsl:value-of select="start/time"/>
                       </a>
@@ -753,5 +753,5 @@
                   <xsl:otherwise>
                     <td class="{$dateRangeStyle} right">
-                      <a href="{$eventView}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">
+                      <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">
                       <xsl:choose>
                         <xsl:when test="start/allday = 'true' and
@@ -770,8 +770,8 @@
                     </td>
                     <td class="{$dateRangeStyle} center">
-                      <a href="{$eventView}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">-</a>
+                      <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">-</a>
                     </td>
                     <td class="{$dateRangeStyle} left">
-                      <a href="{$eventView}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">
+                      <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">
                       <xsl:choose>
                         <xsl:when test="end/allday = 'true' and
@@ -802,5 +802,5 @@
                   <xsl:choose>
                     <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'">
-                      <a href="{$eventView}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">
+                      <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">
                         <strong>
                           <xsl:value-of select="summary"/>:
@@ -826,5 +826,5 @@
                     </xsl:when>
                     <xsl:otherwise>
-                      <a href="{$eventView}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">
+                      <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">
                         <xsl:value-of select="summary"/>
                         <xsl:if test="location/address != ''">, <xsl:value-of select="location/address"/></xsl:if>
@@ -839,5 +839,5 @@
                   </a>
                   <xsl:variable name="eventIcalName" select="concat($id,'.ics')"/>
-                  <a href="{$export}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars">
+                  <a href="{$export}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars">
                     <img src="{$resourcesRoot}/images/std-ical_icon_small.gif" width="12" height="16" border="0" alt="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"/>
                   </a>
@@ -865,5 +865,5 @@
             <td>
               <xsl:variable name="dayDate" select="date"/>
-              <a href="{$setViewPeriod}?viewType=dayView&amp;date={$dayDate}" class="dayLink">
+              <a href="{$setViewPeriod}&amp;viewType=dayView&amp;date={$dayDate}" class="dayLink">
                 <xsl:value-of select="value"/>
               </a>
@@ -899,5 +899,5 @@
                 <td>
                   <xsl:variable name="dayDate" select="date"/>
-                  <a href="{$setViewPeriod}?viewType=dayView&amp;date={$dayDate}" class="dayLink">
+                  <a href="{$setViewPeriod}&amp;viewType=dayView&amp;date={$dayDate}" class="dayLink">
                     <xsl:value-of select="value"/>
                   </a>
@@ -934,5 +934,5 @@
     </xsl:variable>
     <li>
-      <a href="{$eventView}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" class="{$eventClass}">
+      <a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}" class="{$eventClass}">
         <xsl:if test="status='CANCELLED'">CANCELLED: </xsl:if>
         <xsl:value-of select="summary"/>
@@ -993,5 +993,5 @@
           <td colspan="8" class="monthName">
             <xsl:variable name="firstDayOfMonth" select="week/day/date"/>
-            <a href="{$setViewPeriod}?viewType=monthView&amp;date={$firstDayOfMonth}">
+            <a href="{$setViewPeriod}&amp;viewType=monthView&amp;date={$firstDayOfMonth}">
               <xsl:value-of select="longname"/>
             </a>
@@ -1008,5 +1008,5 @@
             <td class="weekCell">
               <xsl:variable name="firstDayOfWeek" select="day/date"/>
-              <a href="{$setViewPeriod}?viewType=weekView&amp;date={$firstDayOfWeek}">
+              <a href="{$setViewPeriod}&amp;viewType=weekView&amp;date={$firstDayOfWeek}">
                 <xsl:value-of select="value"/>
               </a>
@@ -1020,5 +1020,5 @@
                   <td>
                     <xsl:variable name="dayDate" select="date"/>
-                    <a href="{$setViewPeriod}?viewType=dayView&amp;date={$dayDate}">
+                    <a href="{$setViewPeriod}&amp;viewType=dayView&amp;date={$dayDate}">
                       <xsl:value-of select="value"/>
                     </a>
@@ -1071,5 +1071,5 @@
     <xsl:variable name="url" select="path"/>
     <li class="{$itemClass}">
-      <a href="{$setSelection}?calUrl={$url}"><xsl:value-of select="name"/></a>
+      <a href="{$setSelection}&amp;calUrl={$url}"><xsl:value-of select="name"/></a>
       <xsl:if test="calendar">
         <ul>
Index: trunk/calendar3/deployment/webuser/uportal2/resources/demoskins/default/default/default.xsl
===================================================================
--- trunk/calendar3/deployment/webuser/uportal2/resources/demoskins/default/default/default.xsl (revision 614)
+++ trunk/calendar3/deployment/webuser/uportal2/resources/demoskins/default/default/default.xsl (revision 625)
@@ -327,5 +327,5 @@
 					<img alt="print this view" src="{$resourcesRoot}/resources/std-print-icon.gif" width="20" height="14" border="0"/> print
 				</a>
-				<a class="rss" href="{$setSelection}?setappvar=summaryMode(details)&amp;skinName=rss" title="RSS feed">RSS</a>
+				<a class="rss" href="{$setSelection}&amp;setappvar=summaryMode(details)&amp;skinName=rss" title="RSS feed">RSS</a>
 			</td>
 		</table>
@@ -345,8 +345,8 @@
 							<xsl:when test="/bedework/selectionState/selectionType = 'view'
 															and name=/bedework/selectionState/view/name">
-								<li class="selected"><a href="{$setSelection}?viewName={$viewName}"><xsl:value-of select="name"/></a></li>
+								<li class="selected"><a href="{$setSelection}&amp;viewName={$viewName}"><xsl:value-of select="name"/></a></li>
 							</xsl:when>
 							<xsl:otherwise>
-								<li><a href="{$setSelection}?viewName={$viewName}"><xsl:value-of select="name"/></a></li>
+								<li><a href="{$setSelection}&amp;viewName={$viewName}"><xsl:value-of select="name"/></a></li>
 							</xsl:otherwise>
 						</xsl:choose>
@@ -399,5 +399,5 @@
 					<xsl:choose>
 						<xsl:when test="/bedework/page='freeBusy'"><xsl:value-of select="$freeBusy-fetch"/></xsl:when>
-						<xsl:otherwise><xsl:value-of select="$setViewPeriod"/>?b=de</xsl:otherwise>
+						<xsl:otherwise><xsl:value-of select="$setViewPeriod"/></xsl:otherwise>
 					</xsl:choose>
 				</xsl:variable>
@@ -438,8 +438,8 @@
 								<!-- don't allow switching to year for free busy view, so only use setViewPeriod action -->
 								<xsl:when test="/bedework/periodname='Year'">
-									<a href="{$setViewPeriod}?viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-year-on.gif" width="92" height="20" border="0" alt="YEAR"/></a>
+									<a href="{$setViewPeriod}&amp;viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-year-on.gif" width="92" height="20" border="0" alt="YEAR"/></a>
 								</xsl:when>
 								<xsl:otherwise>
-									<a href="{$setViewPeriod}?viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-year-off.gif" width="92" height="20" border="0" alt="YEAR"/></a>
+									<a href="{$setViewPeriod}&amp;viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-year-off.gif" width="92" height="20" border="0" alt="YEAR"/></a>
 								</xsl:otherwise>
 							</xsl:choose>
@@ -450,5 +450,5 @@
 							<strong><xsl:value-of select="/bedework/userid"/></strong>
 							<xsl:text> </xsl:text>
-							<span class="logout"><a href="{$setup}?logout=true">logout</a></span>
+							<span class="logout"><a href="{$setup}&amp;logout=true">logout</a></span>
 						</td>
 					</tr>
@@ -459,14 +459,14 @@
 					<tr>
 						<td>
-							<a href="{$setViewPeriod}?viewType=dayView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-day-off.gif" width="91" height="20" border="0" alt="DAY"/></a>
+							<a href="{$setViewPeriod}&amp;viewType=dayView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-day-off.gif" width="91" height="20" border="0" alt="DAY"/></a>
 						</td>
 						<td>
-							<a href="{$setViewPeriod}?viewType=weekView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-week-off.gif" width="92" height="20" border="0" alt="WEEK"/></a>
+							<a href="{$setViewPeriod}&amp;viewType=weekView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-week-off.gif" width="92" height="20" border="0" alt="WEEK"/></a>
 						</td>
 						<td>
-							<a href="{$setViewPeriod}?viewType=monthView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-month-off.gif" width="90" height="20" border="0" alt="MONTH"/></a>
+							<a href="{$setViewPeriod}&amp;viewType=monthView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-month-off.gif" width="90" height="20" border="0" alt="MONTH"/></a>
 						</td>
 						<td>
-							<a href="{$setViewPeriod}?viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-year-off.gif" width="92" height="20" border="0" alt="YEAR"/></a>
+							<a href="{$setViewPeriod}&amp;viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-year-off.gif" width="92" height="20" border="0" alt="YEAR"/></a>
 						</td>
 						<td class="rightCell">
@@ -475,5 +475,5 @@
 							<strong><xsl:value-of select="/bedework/userid"/></strong>
 							<xsl:text> </xsl:text>
-							<span class="logout"><a href="{$setup}?logout=true">logout</a></span>
+							<span class="logout"><a href="{$setup}&amp;logout=true">logout</a></span>
 						</td>
 					</tr>
@@ -487,5 +487,5 @@
 			<xsl:choose>
 				<xsl:when test="/bedework/page='freeBusy'"><xsl:value-of select="$freeBusy-fetch"/></xsl:when>
-				<xsl:otherwise><xsl:value-of select="$setViewPeriod"/>?b=de</xsl:otherwise>
+				<xsl:otherwise><xsl:value-of select="$setViewPeriod"/></xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
@@ -585,5 +585,5 @@
 						 <xsl:when test="/bedework/periodname = 'day'">
 							 <xsl:variable name="date" select="/bedework/firstday/date"/>
-							 <a href="{$initEvent}?startdate={$date}" title="add event">
+							 <a href="{$initEvent}&amp;startdate={$date}" title="add event">
 									<img src="{$resourcesRoot}/resources/add2mycal-icon-small.gif" width="12" height="16" border="0" alt="add event"/>
 									add event
@@ -609,5 +609,5 @@
 							 <xsl:choose>
 								 <xsl:when test="/bedework/page='freeBusy'">
-									 <a href="{$setViewPeriod}?date={$curdate}"><img src="{$resourcesRoot}/resources/std-button-events.gif" width="70" height="21" border="0" alt="show events"/></a>
+									 <a href="{$setViewPeriod}&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-button-events.gif" width="70" height="21" border="0" alt="show events"/></a>
 								 </xsl:when>
 								 <xsl:otherwise>
@@ -632,10 +632,10 @@
 							 <xsl:choose>
 								 <xsl:when test="/bedework/appvar[key='monthViewMode']/value='list'">
-									 <a href="{$setup}?setappvar=monthViewMode(cal)" title="toggle list/calendar view">
+									 <a href="{$setup}&amp;setappvar=monthViewMode(cal)" title="toggle list/calendar view">
 										 <img src="{$resourcesRoot}/resources/std-button-calview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/>
 									 </a>
 								 </xsl:when>
 								 <xsl:otherwise>
-									 <a href="{$setup}?setappvar=monthViewMode(list)" title="toggle list/calendar view">
+									 <a href="{$setup}&amp;setappvar=monthViewMode(list)" title="toggle list/calendar view">
 										 <img src="{$resourcesRoot}/resources/std-button-listview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/>
 									 </a>
@@ -646,10 +646,10 @@
 							 <xsl:choose>
 								 <xsl:when test="/bedework/appvar[key='weekViewMode']/value='list'">
-									 <a href="{$setup}?setappvar=weekViewMode(cal)" title="toggle list/calendar view">
+									 <a href="{$setup}&amp;setappvar=weekViewMode(cal)" title="toggle list/calendar view">
 										 <img src="{$resourcesRoot}/resources/std-button-calview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/>
 									 </a>
 								 </xsl:when>
 								 <xsl:otherwise>
-									 <a href="{$setup}?setappvar=weekViewMode(list)" title="toggle list/calendar view">
+									 <a href="{$setup}&amp;setappvar=weekViewMode(list)" title="toggle list/calendar view">
 										 <img src="{$resourcesRoot}/resources/std-button-listview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/>
 									 </a>
@@ -680,10 +680,10 @@
 							 <xsl:choose>
 								 <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'">
-									 <a href="{$setup}?setappvar=summaryMode(summary)" title="toggle summary/detailed view">
+									 <a href="{$setup}&amp;setappvar=summaryMode(summary)" title="toggle summary/detailed view">
 										 <img src="{$resourcesRoot}/resources/std-button-summary.gif" width="62" height="21" border="0" alt="toggle summary/detailed view"/>
 									 </a>
 								 </xsl:when>
 								 <xsl:otherwise>
-									 <a href="{$setup}?setappvar=summaryMode(details)" title="toggle summary/detailed view">
+									 <a href="{$setup}&amp;setappvar=summaryMode(details)" title="toggle summary/detailed view">
 										 <img src="{$resourcesRoot}/resources/std-button-details.gif" width="62" height="21" border="0" alt="toggle summary/detailed view"/>
 									 </a>
@@ -717,8 +717,8 @@
 								<td colspan="6" class="dateRow">
 									 <xsl:variable name="date" select="date"/>
-									 <a href="{$initEvent}?startdate={$date}" class="listAdd">
+									 <a href="{$initEvent}&amp;startdate={$date}" class="listAdd">
 										 add event
 									 </a>
-									 <a href="{$setViewPeriod}?viewType=dayView&amp;date={$date}">
+									 <a href="{$setViewPeriod}&amp;viewType=dayView&amp;date={$date}">
 										 <xsl:value-of select="name"/>, <xsl:value-of select="longdate"/>
 									 </a>
@@ -757,5 +757,5 @@
 																	start/time = end/time">
 										<td class="{$dateRangeStyle} center" colspan="3">
-											<a href="{$eventView}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">
+											<a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">
 												<xsl:value-of select="start/time"/>
 											</a>
@@ -764,5 +764,5 @@
 									<xsl:otherwise>
 										<td class="{$dateRangeStyle} right">
-											<a href="{$eventView}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">
+											<a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">
 											<xsl:choose>
 												<xsl:when test="start/allday = 'true' and
@@ -781,8 +781,8 @@
 										</td>
 										<td class="{$dateRangeStyle} center">
-											<a href="{$eventView}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">-</a>
+											<a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">-</a>
 										</td>
 										<td class="{$dateRangeStyle} left">
-											<a href="{$eventView}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">
+											<a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">
 											<xsl:choose>
 												<xsl:when test="end/allday = 'true' and
@@ -814,5 +814,5 @@
 									<xsl:choose>
 										<xsl:when test="/bedework/appvar[key='summaryMode']/value='details'">
-											<a href="{$eventView}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">
+											<a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">
 												<strong>
 													<xsl:value-of select="summary"/>:
@@ -838,5 +838,5 @@
 										</xsl:when>
 										<xsl:otherwise>
-											<a href="{$eventView}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">
+											<a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">
 												<xsl:value-of select="summary"/>
 												<xsl:if test="location/address != ''">, <xsl:value-of select="location/address"/></xsl:if>
@@ -850,5 +850,5 @@
 								<td class="smallIcon">
 									<xsl:variable name="eventIcalName" select="concat($guid,'.ics')"/>
-									<a href="{$export}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars">
+									<a href="{$export}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars">
 										<img src="{$resourcesRoot}/resources/std-ical_icon_small.gif" width="12" height="16" border="0" alt="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"/>
 									</a>
@@ -871,19 +871,19 @@
 				<xsl:choose>
 					<xsl:when test="recurring=true">
-						<a href="{$delEvent}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;confirmationid={$confId}">Remove All</a>
+						<a href="{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;confirmationid={$confId}">Remove All</a>
 					</xsl:when>
 					<xsl:otherwise>
-						<a href="{$delEvent}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;confirmationid={$confId}">Remove</a>
+						<a href="{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;confirmationid={$confId}">Remove</a>
 					</xsl:otherwise>
 				</xsl:choose>
 			</xsl:when>
 			<xsl:when test="calendar/owner = /bedework/userid">
-				<a href="{$editEvent}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">Edit</a> |
+				<a href="{$editEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">Edit</a> |
 				<xsl:choose>
 					<xsl:when test="recurring=true">
-						<a href="{$delEvent}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;confirmationid={$confId}">Delete All</a>
+						<a href="{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;confirmationid={$confId}">Delete All</a>
 					</xsl:when>
 					<xsl:otherwise>
-						<a href="{$delEvent}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;confirmationid={$confId}">Delete</a>
+						<a href="{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;confirmationid={$confId}">Delete</a>
 					</xsl:otherwise>
 				</xsl:choose>
@@ -909,8 +909,8 @@
 						<td>
 							<xsl:variable name="dayDate" select="date"/>
-							<a href="{$initEvent}?startdate={$dayDate}" class="gridAdd" title="add event">
+							<a href="{$initEvent}&amp;startdate={$dayDate}" class="gridAdd" title="add event">
 								<img src="{$resourcesRoot}/resources/addEvent-forGrid-icon.gif" width="9" height="10" border="0" alt="add event"/>
 							</a>
-							<a href="{$setViewPeriod}?viewType=dayView&amp;date={$dayDate}" class="dayLink" title="go to day">
+							<a href="{$setViewPeriod}&amp;viewType=dayView&amp;date={$dayDate}" class="dayLink" title="go to day">
 								<xsl:value-of select="value"/>
 							</a>
@@ -946,8 +946,8 @@
 								<td>
 									<xsl:variable name="dayDate" select="date"/>
-									<a href="{$initEvent}?startdate={$dayDate}" class="gridAdd" title="add event">
+									<a href="{$initEvent}&amp;startdate={$dayDate}" class="gridAdd" title="add event">
 										<img src="{$resourcesRoot}/resources/addEvent-forGrid-icon.gif" width="10" height="10" border="0" alt="add event"/>
 									</a>
-									<a href="{$setViewPeriod}?viewType=dayView&amp;date={$dayDate}" class="dayLink" title="go to day">
+									<a href="{$setViewPeriod}&amp;viewType=dayView&amp;date={$dayDate}" class="dayLink" title="go to day">
 										<xsl:value-of select="value"/>
 									</a>
@@ -1003,5 +1003,5 @@
 		</xsl:variable>
 		<li>
-			<a href="{$eventView}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"
+			<a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"
 				class="{$eventRootClass} {$eventClass} {$subColor}">
 				<xsl:if test="status='CANCELLED'">CANCELLED: </xsl:if>
@@ -1084,5 +1084,5 @@
 					<td colspan="8" class="monthName">
 						<xsl:variable name="firstDayOfMonth" select="week/day/date"/>
-						<a href="{$setViewPeriod}?viewType=monthView&amp;date={$firstDayOfMonth}">
+						<a href="{$setViewPeriod}&amp;viewType=monthView&amp;date={$firstDayOfMonth}">
 							<xsl:value-of select="longname"/>
 						</a>
@@ -1099,5 +1099,5 @@
 						<td class="weekCell">
 							<xsl:variable name="firstDayOfWeek" select="day/date"/>
-							<a href="{$setViewPeriod}?viewType=weekView&amp;date={$firstDayOfWeek}">
+							<a href="{$setViewPeriod}&amp;viewType=weekView&amp;date={$firstDayOfWeek}">
 								<xsl:value-of select="value"/>
 							</a>
@@ -1111,5 +1111,5 @@
 									<td>
 										<xsl:variable name="dayDate" select="date"/>
-										<a href="{$setViewPeriod}?viewType=dayView&amp;date={$dayDate}">
+										<a href="{$setViewPeriod}&amp;viewType=dayView&amp;date={$dayDate}">
 											<xsl:value-of select="value"/>
 										</a>
@@ -1156,5 +1156,5 @@
 					<div id="eventActions">
 						<xsl:variable name="eventIcalName" select="concat($guid,'.ics')"/>
-						<a href="{$export}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars">
+						<a href="{$export}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars">
 							<img src="{$resourcesRoot}/resources/std-icalDownload-icon-small.gif" width="12" height="16" border="0" alt="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"/>
 							Download
@@ -1164,5 +1164,5 @@
 								<xsl:choose>
 									<xsl:when test="recurring=true">
-										<a href="{$delEvent}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;confirmationid={$confId}">
+										<a href="{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;confirmationid={$confId}">
 											<img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/>
 											Remove All (recurring)
@@ -1170,5 +1170,5 @@
 									</xsl:when>
 									<xsl:otherwise>
-										<a href="{$delEvent}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;confirmationid={$confId}">
+										<a href="{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;confirmationid={$confId}">
 											<img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/>
 											Remove
@@ -1178,5 +1178,5 @@
 							</xsl:when>
 							<xsl:when test="currentAccess/current-user-privilege-set/privilege/write-content">
-								<a href="{$editEvent}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;confirmationid={$confId}">
+								<a href="{$editEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;confirmationid={$confId}">
 									<img src="{$resourcesRoot}/resources/std-ical_iconEditDkGray.gif" width="12" height="16" border="0" alt="edit"/>
 									Edit
@@ -1194,5 +1194,5 @@
 							<xsl:choose>
 								<xsl:when test="recurring=true">
-									<a href="{$delEvent}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;confirmationid={$confId}">
+									<a href="{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;confirmationid={$confId}">
 										<img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/>
 										Delete All (recurring)
@@ -1200,5 +1200,5 @@
 								</xsl:when>
 								<xsl:otherwise>
-									<a href="{$delEvent}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;confirmationid={$confId}">
+									<a href="{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;confirmationid={$confId}">
 										<img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/>
 										Delete
@@ -1257,5 +1257,5 @@
 				<!--<th class="icon" rowspan="2">
 					<xsl:variable name="eventIcalName" select="concat($guid,'.ics')"/>
-					<a href="{$export}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars">
+					<a href="{$export}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars">
 						<img src="{$resourcesRoot}/resources/std-ical-icon.gif" width="20" height="26" border="0" align="left" alt="Download this event"/>
 					</a>
@@ -1378,5 +1378,5 @@
 							<xsl:variable name="email" select="sponsor/email"/>
 							<xsl:variable name="subject" select="summary"/>
-							<a href="mailto:{$email}?subject={$subject}">
+							<a href="mailto:{$email}&amp;subject={$subject}">
 								<xsl:value-of select="sponsor/email"/>
 							</a>
@@ -1391,5 +1391,5 @@
 						<xsl:variable name="calUrl" select="calendar/encodedPath"/>
 						<xsl:variable name="userPath">user/<xsl:value-of select="/bedework/userid"/>/</xsl:variable>
-						<a href="{$setSelection}?calUrl={$calUrl}">
+						<a href="{$setSelection}&amp;calUrl={$calUrl}">
 							<xsl:choose>
 								<xsl:when test="contains(calendar/path,$userPath)">
@@ -1801,5 +1801,5 @@
 					<th colspan="2" class="commonHeader">
 						<div id="eventActions">
-							<a href="{$eventView}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;confirmationid={$confId}">
+							<a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;confirmationid={$confId}">
 								<img src="{$resourcesRoot}/resources/glassFill-icon-viewGray.gif" width="13" height="13" border="0" alt="view"/>
 								View
@@ -1807,5 +1807,5 @@
 							<xsl:if test="currentAccess/current-user-privilege-set/privilege/unbind">
 								|
-								<a href="{$delEvent}?subid={$subscriptionId}&amp;calPath={$calPathEncoded}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;confirmationid={$confId}">
+								<a href="{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPathEncoded}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;confirmationid={$confId}">
 									<img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/>
 									Delete
@@ -2257,5 +2257,5 @@
 						</xsl:variable>
 						<td class="{$fbClass}">
-							<a href="{$initEvent}?startdate={$startDate}&amp;minutes={$minutes}" title="{$startTime}">*</a>
+							<a href="{$initEvent}&amp;startdate={$startDate}&amp;minutes={$minutes}" title="{$startTime}">*</a>
 						</td>
 					</xsl:for-each>
@@ -2418,5 +2418,5 @@
 			<li class="{$itemClass}">
 				<xsl:variable name="calPath" select="path"/>
-				<a href="{$setSelection}?calUrl={$calPath}">
+				<a href="{$setSelection}&amp;calUrl={$calPath}">
 					<xsl:value-of select="name"/>
 				</a>
@@ -2431,6 +2431,6 @@
 					<xsl:variable name="startDate"><xsl:value-of select="/bedework/firstday/date"/>T<xsl:value-of select="substring(/bedework/now/time,1,2)"/>0000</xsl:variable>
 					<!-- skip setting duration for now; this should be set in the user's prefs-->
-					<!-- <a href="{$initEvent}?startdate={$startDate}&amp;newCalPath={$calPath}&amp;minutes=60" class="calendarAdd" title="add event"> -->
-					<a href="{$initEvent}?startdate={$startDate}&amp;newCalPath={$calPath}" class="calendarAdd" title="add event">
+					<!-- <a href="{$initEvent}&amp;startdate={$startDate}&amp;newCalPath={$calPath}&amp;minutes=60" class="calendarAdd" title="add event"> -->
+					<a href="{$initEvent}&amp;startdate={$startDate}&amp;newCalPath={$calPath}" class="calendarAdd" title="add event">
 						<img src="{$resourcesRoot}/resources/addEvent-forCals-icon.gif" width="9" height="12" border="0" alt="add event"/>
 					</a>
@@ -3328,5 +3328,5 @@
 				<img src="{$resourcesRoot}/resources/spacer.gif" width="6" height="6" alt="subscription style" class="subStyle {$subStyle}"/>
 			</xsl:if>
-			<a href="{$setSelection}?subname={$subName}">
+			<a href="{$setSelection}&amp;subname={$subName}">
 				<xsl:value-of select="name"/>
 			</a>
@@ -3337,5 +3337,5 @@
 				<xsl:variable name="calPath" select="calendars/calendar/encodedPath"/>
 				<xsl:variable name="startDate"><xsl:value-of select="/bedework/firstday/date"/>T<xsl:value-of select="substring(/bedework/now/time,1,2)"/>0000</xsl:variable>
-				<a href="{$initEvent}?startdate={$startDate}&amp;newCalPath={$calPath}&amp;minutes=60" class="calendarAdd" title="add event">
+				<a href="{$initEvent}&amp;startdate={$startDate}&amp;newCalPath={$calPath}&amp;minutes=60" class="calendarAdd" title="add event">
 					<img src="{$resourcesRoot}/resources/addEvent-forCals-icon.gif" width="9" height="12" border="0" alt="add event"/>
 				</a>
@@ -3610,5 +3610,5 @@
 					<td align="right">
 						<xsl:variable name="locId" select="form/id"/>
-						<a href="{$delLocation}?locationId={$locId}">
+						<a href="{$delLocation}&amp;locationId={$locId}">
 							<input type="button" name="delete" value="Delete Location"/>
 						</a>
@@ -3632,5 +3632,5 @@
 						<li>
 							<xsl:variable name="locationId" select="@value"/>
-							<a href="{$editLocation}?locationId={$locationId}"><xsl:value-of select="."/></a>
+							<a href="{$editLocation}&amp;locationId={$locationId}"><xsl:value-of select="."/></a>
 						</li>
 					</xsl:for-each>
@@ -3992,5 +3992,5 @@
 		<xsl:variable name="calPath" select="encodedPath"/>
 		<div class="std-text">
-			<a href="{$setSelection}?calPath={$calPath}"><xsl:value-of select="title"/></a>
+			<a href="{$setSelection}&amp;calPath={$calPath}"><xsl:value-of select="title"/></a>
 		</div>
 	</xsl:template>
Index: trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
===================================================================
--- trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl (revision 592)
+++ trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl (revision 625)
@@ -327,5 +327,5 @@
 					<img alt="print this view" src="{$resourcesRoot}/resources/std-print-icon.gif" width="20" height="14" border="0"/> print
 				</a>
-				<a class="rss" href="{$setSelection}?setappvar=summaryMode(details)&amp;skinName=rss" title="RSS feed">RSS</a>
+				<a class="rss" href="{$setSelection}&amp;setappvar=summaryMode(details)&amp;skinName=rss" title="RSS feed">RSS</a>
 			</td>
 		</table>
@@ -345,8 +345,8 @@
 							<xsl:when test="/bedework/selectionState/selectionType = 'view'
 															and name=/bedework/selectionState/view/name">
-								<li class="selected"><a href="{$setSelection}?viewName={$viewName}"><xsl:value-of select="name"/></a></li>
+								<li class="selected"><a href="{$setSelection}&amp;viewName={$viewName}"><xsl:value-of select="name"/></a></li>
 							</xsl:when>
 							<xsl:otherwise>
-								<li><a href="{$setSelection}?viewName={$viewName}"><xsl:value-of select="name"/></a></li>
+								<li><a href="{$setSelection}&amp;viewName={$viewName}"><xsl:value-of select="name"/></a></li>
 							</xsl:otherwise>
 						</xsl:choose>
@@ -399,5 +399,5 @@
 					<xsl:choose>
 						<xsl:when test="/bedework/page='freeBusy'"><xsl:value-of select="$freeBusy-fetch"/></xsl:when>
-						<xsl:otherwise><xsl:value-of select="$setViewPeriod"/>?b=de</xsl:otherwise>
+						<xsl:otherwise><xsl:value-of select="$setViewPeriod"/></xsl:otherwise>
 					</xsl:choose>
 				</xsl:variable>
@@ -438,8 +438,8 @@
 								<!-- don't allow switching to year for free busy view, so only use setViewPeriod action -->
 								<xsl:when test="/bedework/periodname='Year'">
-									<a href="{$setViewPeriod}?viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-year-on.gif" width="92" height="20" border="0" alt="YEAR"/></a>
+									<a href="{$setViewPeriod}&amp;viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-year-on.gif" width="92" height="20" border="0" alt="YEAR"/></a>
 								</xsl:when>
 								<xsl:otherwise>
-									<a href="{$setViewPeriod}?viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-year-off.gif" width="92" height="20" border="0" alt="YEAR"/></a>
+									<a href="{$setViewPeriod}&amp;viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-year-off.gif" width="92" height="20" border="0" alt="YEAR"/></a>
 								</xsl:otherwise>
 							</xsl:choose>
@@ -450,5 +450,5 @@
 							<strong><xsl:value-of select="/bedework/userid"/></strong>
 							<xsl:text> </xsl:text>
-							<span class="logout"><a href="{$setup}?logout=true">logout</a></span>
+							<span class="logout"><a href="{$setup}&amp;logout=true">logout</a></span>
 						</td>
 					</tr>
@@ -459,14 +459,14 @@
 					<tr>
 						<td>
-							<a href="{$setViewPeriod}?viewType=dayView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-day-off.gif" width="91" height="20" border="0" alt="DAY"/></a>
+							<a href="{$setViewPeriod}&amp;viewType=dayView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-day-off.gif" width="91" height="20" border="0" alt="DAY"/></a>
 						</td>
 						<td>
-							<a href="{$setViewPeriod}?viewType=weekView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-week-off.gif" width="92" height="20" border="0" alt="WEEK"/></a>
+							<a href="{$setViewPeriod}&amp;viewType=weekView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-week-off.gif" width="92" height="20" border="0" alt="WEEK"/></a>
 						</td>
 						<td>
-							<a href="{$setViewPeriod}?viewType=monthView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-month-off.gif" width="90" height="20" border="0" alt="MONTH"/></a>
+							<a href="{$setViewPeriod}&amp;viewType=monthView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-month-off.gif" width="90" height="20" border="0" alt="MONTH"/></a>
 						</td>
 						<td>
-							<a href="{$setViewPeriod}?viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-year-off.gif" width="92" height="20" border="0" alt="YEAR"/></a>
+							<a href="{$setViewPeriod}&amp;viewType=yearView&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-tab-year-off.gif" width="92" height="20" border="0" alt="YEAR"/></a>
 						</td>
 						<td class="rightCell">
@@ -475,5 +475,5 @@
 							<strong><xsl:value-of select="/bedework/userid"/></strong>
 							<xsl:text> </xsl:text>
-							<span class="logout"><a href="{$setup}?logout=true">logout</a></span>
+							<span class="logout"><a href="{$setup}&amp;logout=true">logout</a></span>
 						</td>
 					</tr>
@@ -487,5 +487,5 @@
 			<xsl:choose>
 				<xsl:when test="/bedework/page='freeBusy'"><xsl:value-of select="$freeBusy-fetch"/></xsl:when>
-				<xsl:otherwise><xsl:value-of select="$setViewPeriod"/>?b=de</xsl:otherwise>
+				<xsl:otherwise><xsl:value-of select="$setViewPeriod"/></xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
@@ -585,5 +585,5 @@
 						 <xsl:when test="/bedework/periodname = 'day'">
 							 <xsl:variable name="date" select="/bedework/firstday/date"/>
-							 <a href="{$initEvent}?startdate={$date}" title="add event">
+							 <a href="{$initEvent}&amp;startdate={$date}" title="add event">
 									<img src="{$resourcesRoot}/resources/add2mycal-icon-small.gif" width="12" height="16" border="0" alt="add event"/>
 									add event
@@ -609,5 +609,5 @@
 							 <xsl:choose>
 								 <xsl:when test="/bedework/page='freeBusy'">
-									 <a href="{$setViewPeriod}?date={$curdate}"><img src="{$resourcesRoot}/resources/std-button-events.gif" width="70" height="21" border="0" alt="show events"/></a>
+									 <a href="{$setViewPeriod}&amp;date={$curdate}"><img src="{$resourcesRoot}/resources/std-button-events.gif" width="70" height="21" border="0" alt="show events"/></a>
 								 </xsl:when>
 								 <xsl:otherwise>
@@ -632,10 +632,10 @@
 							 <xsl:choose>
 								 <xsl:when test="/bedework/appvar[key='monthViewMode']/value='list'">
-									 <a href="{$setup}?setappvar=monthViewMode(cal)" title="toggle list/calendar view">
+									 <a href="{$setup}&amp;setappvar=monthViewMode(cal)" title="toggle list/calendar view">
 										 <img src="{$resourcesRoot}/resources/std-button-calview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/>
 									 </a>
 								 </xsl:when>
 								 <xsl:otherwise>
-									 <a href="{$setup}?setappvar=monthViewMode(list)" title="toggle list/calendar view">
+									 <a href="{$setup}&amp;setappvar=monthViewMode(list)" title="toggle list/calendar view">
 										 <img src="{$resourcesRoot}/resources/std-button-listview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/>
 									 </a>
@@ -646,10 +646,10 @@
 							 <xsl:choose>
 								 <xsl:when test="/bedework/appvar[key='weekViewMode']/value='list'">
-									 <a href="{$setup}?setappvar=weekViewMode(cal)" title="toggle list/calendar view">
+									 <a href="{$setup}&amp;setappvar=weekViewMode(cal)" title="toggle list/calendar view">
 										 <img src="{$resourcesRoot}/resources/std-button-calview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/>
 									 </a>
 								 </xsl:when>
 								 <xsl:otherwise>
-									 <a href="{$setup}?setappvar=weekViewMode(list)" title="toggle list/calendar view">
+									 <a href="{$setup}&amp;setappvar=weekViewMode(list)" title="toggle list/calendar view">
 										 <img src="{$resourcesRoot}/resources/std-button-listview.gif" width="46" height="21" border="0" alt="toggle list/calendar view"/>
 									 </a>
@@ -680,10 +680,10 @@
 							 <xsl:choose>
 								 <xsl:when test="/bedework/appvar[key='summaryMode']/value='details'">
-									 <a href="{$setup}?setappvar=summaryMode(summary)" title="toggle summary/detailed view">
+									 <a href="{$setup}&amp;setappvar=summaryMode(summary)" title="toggle summary/detailed view">
 										 <img src="{$resourcesRoot}/resources/std-button-summary.gif" width="62" height="21" border="0" alt="toggle summary/detailed view"/>
 									 </a>
 								 </xsl:when>
 								 <xsl:otherwise>
-									 <a href="{$setup}?setappvar=summaryMode(details)" title="toggle summary/detailed view">
+									 <a href="{$setup}&amp;setappvar=summaryMode(details)" title="toggle summary/detailed view">
 										 <img src="{$resourcesRoot}/resources/std-button-details.gif" width="62" height="21" border="0" alt="toggle summary/detailed view"/>
 									 </a>
@@ -717,8 +717,8 @@
 								<td colspan="6" class="dateRow">
 									 <xsl:variable name="date" select="date"/>
-									 <a href="{$initEvent}?startdate={$date}" class="listAdd">
+									 <a href="{$initEvent}&amp;startdate={$date}" class="listAdd">
 										 add event
 									 </a>
-									 <a href="{$setViewPeriod}?viewType=dayView&amp;date={$date}">
+									 <a href="{$setViewPeriod}&amp;viewType=dayView&amp;date={$date}">
 										 <xsl:value-of select="name"/>, <xsl:value-of select="longdate"/>
 									 </a>
@@ -757,5 +757,5 @@
 																	start/time = end/time">
 										<td class="{$dateRangeStyle} center" colspan="3">
-											<a href="{$eventView}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">
+											<a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">
 												<xsl:value-of select="start/time"/>
 											</a>
@@ -764,5 +764,5 @@
 									<xsl:otherwise>
 										<td class="{$dateRangeStyle} right">
-											<a href="{$eventView}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">
+											<a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">
 											<xsl:choose>
 												<xsl:when test="start/allday = 'true' and
@@ -781,8 +781,8 @@
 										</td>
 										<td class="{$dateRangeStyle} center">
-											<a href="{$eventView}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">-</a>
+											<a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">-</a>
 										</td>
 										<td class="{$dateRangeStyle} left">
-											<a href="{$eventView}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">
+											<a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">
 											<xsl:choose>
 												<xsl:when test="end/allday = 'true' and
@@ -814,5 +814,5 @@
 									<xsl:choose>
 										<xsl:when test="/bedework/appvar[key='summaryMode']/value='details'">
-											<a href="{$eventView}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">
+											<a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">
 												<strong>
 													<xsl:value-of select="summary"/>:
@@ -838,5 +838,5 @@
 										</xsl:when>
 										<xsl:otherwise>
-											<a href="{$eventView}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">
+											<a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">
 												<xsl:value-of select="summary"/>
 												<xsl:if test="location/address != ''">, <xsl:value-of select="location/address"/></xsl:if>
@@ -850,5 +850,5 @@
 								<td class="smallIcon">
 									<xsl:variable name="eventIcalName" select="concat($guid,'.ics')"/>
-									<a href="{$export}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars">
+									<a href="{$export}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars">
 										<img src="{$resourcesRoot}/resources/std-ical_icon_small.gif" width="12" height="16" border="0" alt="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"/>
 									</a>
@@ -871,19 +871,19 @@
 				<xsl:choose>
 					<xsl:when test="recurring=true">
-						<a href="{$delEvent}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;confirmationid={$confId}">Remove All</a>
+						<a href="{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;confirmationid={$confId}">Remove All</a>
 					</xsl:when>
 					<xsl:otherwise>
-						<a href="{$delEvent}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;confirmationid={$confId}">Remove</a>
+						<a href="{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;confirmationid={$confId}">Remove</a>
 					</xsl:otherwise>
 				</xsl:choose>
 			</xsl:when>
 			<xsl:when test="calendar/owner = /bedework/userid">
-				<a href="{$editEvent}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">Edit</a> |
+				<a href="{$editEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}">Edit</a> |
 				<xsl:choose>
 					<xsl:when test="recurring=true">
-						<a href="{$delEvent}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;confirmationid={$confId}">Delete All</a>
+						<a href="{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;confirmationid={$confId}">Delete All</a>
 					</xsl:when>
 					<xsl:otherwise>
-						<a href="{$delEvent}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;confirmationid={$confId}">Delete</a>
+						<a href="{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;confirmationid={$confId}">Delete</a>
 					</xsl:otherwise>
 				</xsl:choose>
@@ -909,8 +909,8 @@
 						<td>
 							<xsl:variable name="dayDate" select="date"/>
-							<a href="{$initEvent}?startdate={$dayDate}" class="gridAdd" title="add event">
+							<a href="{$initEvent}&amp;startdate={$dayDate}" class="gridAdd" title="add event">
 								<img src="{$resourcesRoot}/resources/addEvent-forGrid-icon.gif" width="9" height="10" border="0" alt="add event"/>
 							</a>
-							<a href="{$setViewPeriod}?viewType=dayView&amp;date={$dayDate}" class="dayLink" title="go to day">
+							<a href="{$setViewPeriod}&amp;viewType=dayView&amp;date={$dayDate}" class="dayLink" title="go to day">
 								<xsl:value-of select="value"/>
 							</a>
@@ -946,8 +946,8 @@
 								<td>
 									<xsl:variable name="dayDate" select="date"/>
-									<a href="{$initEvent}?startdate={$dayDate}" class="gridAdd" title="add event">
+									<a href="{$initEvent}&amp;startdate={$dayDate}" class="gridAdd" title="add event">
 										<img src="{$resourcesRoot}/resources/addEvent-forGrid-icon.gif" width="10" height="10" border="0" alt="add event"/>
 									</a>
-									<a href="{$setViewPeriod}?viewType=dayView&amp;date={$dayDate}" class="dayLink" title="go to day">
+									<a href="{$setViewPeriod}&amp;viewType=dayView&amp;date={$dayDate}" class="dayLink" title="go to day">
 										<xsl:value-of select="value"/>
 									</a>
@@ -1003,5 +1003,5 @@
 		</xsl:variable>
 		<li>
-			<a href="{$eventView}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"
+			<a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}"
 				class="{$eventRootClass} {$eventClass} {$subColor}">
 				<xsl:if test="status='CANCELLED'">CANCELLED: </xsl:if>
@@ -1084,5 +1084,5 @@
 					<td colspan="8" class="monthName">
 						<xsl:variable name="firstDayOfMonth" select="week/day/date"/>
-						<a href="{$setViewPeriod}?viewType=monthView&amp;date={$firstDayOfMonth}">
+						<a href="{$setViewPeriod}&amp;viewType=monthView&amp;date={$firstDayOfMonth}">
 							<xsl:value-of select="longname"/>
 						</a>
@@ -1099,5 +1099,5 @@
 						<td class="weekCell">
 							<xsl:variable name="firstDayOfWeek" select="day/date"/>
-							<a href="{$setViewPeriod}?viewType=weekView&amp;date={$firstDayOfWeek}">
+							<a href="{$setViewPeriod}&amp;viewType=weekView&amp;date={$firstDayOfWeek}">
 								<xsl:value-of select="value"/>
 							</a>
@@ -1111,5 +1111,5 @@
 									<td>
 										<xsl:variable name="dayDate" select="date"/>
-										<a href="{$setViewPeriod}?viewType=dayView&amp;date={$dayDate}">
+										<a href="{$setViewPeriod}&amp;viewType=dayView&amp;date={$dayDate}">
 											<xsl:value-of select="value"/>
 										</a>
@@ -1156,5 +1156,5 @@
 					<div id="eventActions">
 						<xsl:variable name="eventIcalName" select="concat($guid,'.ics')"/>
-						<a href="{$export}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars">
+						<a href="{$export}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars">
 							<img src="{$resourcesRoot}/resources/std-icalDownload-icon-small.gif" width="12" height="16" border="0" alt="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars"/>
 							Download
@@ -1164,5 +1164,5 @@
 								<xsl:choose>
 									<xsl:when test="recurring=true">
-										<a href="{$delEvent}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;confirmationid={$confId}">
+										<a href="{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;confirmationid={$confId}">
 											<img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/>
 											Remove All (recurring)
@@ -1170,5 +1170,5 @@
 									</xsl:when>
 									<xsl:otherwise>
-										<a href="{$delEvent}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;confirmationid={$confId}">
+										<a href="{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;confirmationid={$confId}">
 											<img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/>
 											Remove
@@ -1178,5 +1178,5 @@
 							</xsl:when>
 							<xsl:when test="currentAccess/current-user-privilege-set/privilege/write-content">
-								<a href="{$editEvent}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;confirmationid={$confId}">
+								<a href="{$editEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;confirmationid={$confId}">
 									<img src="{$resourcesRoot}/resources/std-ical_iconEditDkGray.gif" width="12" height="16" border="0" alt="edit"/>
 									Edit
@@ -1194,5 +1194,5 @@
 							<xsl:choose>
 								<xsl:when test="recurring=true">
-									<a href="{$delEvent}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;confirmationid={$confId}">
+									<a href="{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;confirmationid={$confId}">
 										<img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/>
 										Delete All (recurring)
@@ -1200,5 +1200,5 @@
 								</xsl:when>
 								<xsl:otherwise>
-									<a href="{$delEvent}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;confirmationid={$confId}">
+									<a href="{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;confirmationid={$confId}">
 										<img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/>
 										Delete
@@ -1257,5 +1257,5 @@
 				<!--<th class="icon" rowspan="2">
 					<xsl:variable name="eventIcalName" select="concat($guid,'.ics')"/>
-					<a href="{$export}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars">
+					<a href="{$export}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;nocache=no&amp;skinName=ical&amp;contentType=text/calendar&amp;contentName={$eventIcalName}" title="Download event as ical - for Outlook, PDAs, iCal, and other desktop calendars">
 						<img src="{$resourcesRoot}/resources/std-ical-icon.gif" width="20" height="26" border="0" align="left" alt="Download this event"/>
 					</a>
@@ -1378,5 +1378,5 @@
 							<xsl:variable name="email" select="sponsor/email"/>
 							<xsl:variable name="subject" select="summary"/>
-							<a href="mailto:{$email}?subject={$subject}">
+							<a href="mailto:{$email}&amp;subject={$subject}">
 								<xsl:value-of select="sponsor/email"/>
 							</a>
@@ -1391,5 +1391,5 @@
 						<xsl:variable name="calUrl" select="calendar/encodedPath"/>
 						<xsl:variable name="userPath">user/<xsl:value-of select="/bedework/userid"/>/</xsl:variable>
-						<a href="{$setSelection}?calUrl={$calUrl}">
+						<a href="{$setSelection}&amp;calUrl={$calUrl}">
 							<xsl:choose>
 								<xsl:when test="contains(calendar/path,$userPath)">
@@ -1801,5 +1801,5 @@
 					<th colspan="2" class="commonHeader">
 						<div id="eventActions">
-							<a href="{$eventView}?subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;confirmationid={$confId}">
+							<a href="{$eventView}&amp;subid={$subscriptionId}&amp;calPath={$calPath}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;confirmationid={$confId}">
 								<img src="{$resourcesRoot}/resources/glassFill-icon-viewGray.gif" width="13" height="13" border="0" alt="view"/>
 								View
@@ -1807,5 +1807,5 @@
 							<xsl:if test="currentAccess/current-user-privilege-set/privilege/unbind">
 								|
-								<a href="{$delEvent}?subid={$subscriptionId}&amp;calPath={$calPathEncoded}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;confirmationid={$confId}">
+								<a href="{$delEvent}&amp;subid={$subscriptionId}&amp;calPath={$calPathEncoded}&amp;guid={$guid}&amp;recurrenceId={$recurrenceId}&amp;confirmationid={$confId}">
 									<img src="{$resourcesRoot}/resources/trashIcon.gif" width="13" height="13" border="0" alt="delete"/>
 									Delete
@@ -2257,5 +2257,5 @@
 						</xsl:variable>
 						<td class="{$fbClass}">
-							<a href="{$initEvent}?startdate={$startDate}&amp;minutes={$minutes}" title="{$startTime}">*</a>
+							<a href="{$initEvent}&amp;startdate={$startDate}&amp;minutes={$minutes}" title="{$startTime}">*</a>
 						</td>
 					</xsl:for-each>
@@ -2418,5 +2418,5 @@
 			<li class="{$itemClass}">
 				<xsl:variable name="calPath" select="path"/>
-				<a href="{$setSelection}?calUrl={$calPath}">
+				<a href="{$setSelection}&amp;calUrl={$calPath}">
 					<xsl:value-of select="name"/>
 				</a>
@@ -2431,6 +2431,6 @@
 					<xsl:variable name="startDate"><xsl:value-of select="/bedework/firstday/date"/>T<xsl:value-of select="substring(/bedework/now/time,1,2)"/>0000</xsl:variable>
 					<!-- skip setting duration for now; this should be set in the user's prefs-->
-					<!-- <a href="{$initEvent}?startdate={$startDate}&amp;newCalPath={$calPath}&amp;minutes=60" class="calendarAdd" title="add event"> -->
-					<a href="{$initEvent}?startdate={$startDate}&amp;newCalPath={$calPath}" class="calendarAdd" title="add event">
+					<!-- <a href="{$initEvent}&amp;startdate={$startDate}&amp;newCalPath={$calPath}&amp;minutes=60" class="calendarAdd" title="add event"> -->
+					<a href="{$initEvent}&amp;startdate={$startDate}&amp;newCalPath={$calPath}" class="calendarAdd" title="add event">
 						<img src="{$resourcesRoot}/resources/addEvent-forCals-icon.gif" width="9" height="12" border="0" alt="add event"/>
 					</a>
@@ -3328,5 +3328,5 @@
 				<img src="{$resourcesRoot}/resources/spacer.gif" width="6" height="6" alt="subscription style" class="subStyle {$subStyle}"/>
 			</xsl:if>
-			<a href="{$setSelection}?subname={$subName}">
+			<a href="{$setSelection}&amp;subname={$subName}">
 				<xsl:value-of select="name"/>
 			</a>
@@ -3337,5 +3337,5 @@
 				<xsl:variable name="calPath" select="calendars/calendar/encodedPath"/>
 				<xsl:variable name="startDate"><xsl:value-of select="/bedework/firstday/date"/>T<xsl:value-of select="substring(/bedework/now/time,1,2)"/>0000</xsl:variable>
-				<a href="{$initEvent}?startdate={$startDate}&amp;newCalPath={$calPath}&amp;minutes=60" class="calendarAdd" title="add event">
+				<a href="{$initEvent}&amp;startdate={$startDate}&amp;newCalPath={$calPath}&amp;minutes=60" class="calendarAdd" title="add event">
 					<img src="{$resourcesRoot}/resources/addEvent-forCals-icon.gif" width="9" height="12" border="0" alt="add event"/>
 				</a>
@@ -3610,5 +3610,5 @@
 					<td align="right">
 						<xsl:variable name="locId" select="form/id"/>
-						<a href="{$delLocation}?locationId={$locId}">
+						<a href="{$delLocation}&amp;locationId={$locId}">
 							<input type="button" name="delete" value="Delete Location"/>
 						</a>
@@ -3632,5 +3632,5 @@
 						<li>
 							<xsl:variable name="locationId" select="@value"/>
-							<a href="{$editLocation}?locationId={$locationId}"><xsl:value-of select="."/></a>
+							<a href="{$editLocation}&amp;locationId={$locationId}"><xsl:value-of select="."/></a>
 						</li>
 					</xsl:for-each>
@@ -3992,5 +3992,5 @@
 		<xsl:variable name="calPath" select="encodedPath"/>
 		<div class="std-text">
-			<a href="{$setSelection}?calPath={$calPath}"><xsl:value-of select="title"/></a>
+			<a href="{$setSelection}&amp;calPath={$calPath}"><xsl:value-of select="title"/></a>
 		</div>
 	</xsl:template>
Index: trunk/calendar3/webclient/war/docs/header.jsp
===================================================================
--- trunk/calendar3/webclient/war/docs/header.jsp (revision 598)
+++ trunk/calendar3/webclient/war/docs/header.jsp (revision 625)
@@ -120,12 +120,12 @@
 
     <%-- action urls --%>
-    <setup><genurl:rewrite action="setup.do"/></setup>
-    <setSelection><genurl:rewrite action="setSelection.do"/></setSelection>
-    <setViewPeriod><genurl:rewrite action="setViewPeriod.do"/></setViewPeriod>
+    <setup><genurl:rewrite action="setup.do?b=de"/></setup>
+    <setSelection><genurl:rewrite action="setSelection.do?b=de"/></setSelection>
+    <setViewPeriod><genurl:rewrite action="setViewPeriod.do?b=de"/></setViewPeriod>
     <eventView><genurl:rewrite action="eventView.do?b=de"/></eventView>
-    <mailEvent><genurl:rewrite action="mailEvent.do"/></mailEvent>
-    <showPage><genurl:rewrite action="showPage.do"/></showPage>
-
-    <export><genurl:rewrite action="export.do"/></export>
+    <mailEvent><genurl:rewrite action="mailEvent.do?b=de"/></mailEvent>
+    <showPage><genurl:rewrite action="showPage.do?b=de"/></showPage>
+
+    <export><genurl:rewrite action="export.do?b=de"/></export>
     <stats><genurl:rewrite action="stats.do?b=de"/></stats>
 
@@ -135,9 +135,9 @@
     <!-- The following URLs are used only in the personal client -->
     <logic:equal name="calForm" property="guest" value="false">
-      <initEvent><genurl:rewrite action="initEvent.do"/></initEvent>
-      <addEvent><genurl:rewrite action="addEvent.do"/></addEvent>
-      <addEventUsingPage><genurl:rewrite action="addEventUsingPage.do"/></addEventUsingPage>
-      <editEvent><genurl:rewrite action="editEvent.do"/></editEvent>
-      <delEvent><genurl:rewrite action="delEvent.do"/></delEvent>
+      <initEvent><genurl:rewrite action="initEvent.do?b=de"/></initEvent>
+      <addEvent><genurl:rewrite action="addEvent.do?b=de"/></addEvent>
+      <addEventUsingPage><genurl:rewrite action="addEventUsingPage.do?b=de"/></addEventUsingPage>
+      <editEvent><genurl:rewrite action="editEvent.do?b=de"/></editEvent>
+      <delEvent><genurl:rewrite action="delEvent.do?b=de"/></delEvent>
       <event>
         <setAccess><genurl:link page="/event/setAccess.do?b=de"/></setAccess>
@@ -171,8 +171,8 @@
       </subscriptions>
 
-      <manageLocations><genurl:rewrite action="manageLocations.do"/></manageLocations>
-      <addLocation><genurl:rewrite action="addLocation.do"/></addLocation>
-      <editLocation><genurl:rewrite action="editLoc.do"/></editLocation>
-      <delLocation><genurl:rewrite action="delLocation.do"/></delLocation>
+      <manageLocations><genurl:rewrite action="manageLocations.do?b=de"/></manageLocations>
+      <addLocation><genurl:rewrite action="addLocation.do?b=de"/></addLocation>
+      <editLocation><genurl:rewrite action="editLoc.do?b=de"/></editLocation>
+      <delLocation><genurl:rewrite action="delLocation.do?b=de"/></delLocation>
 
       <prefs>
@@ -181,8 +181,8 @@
       </prefs>
 
-      <initEventAlarm><genurl:rewrite action="initEventAlarm.do"/></initEventAlarm>
-      <setAlarm><genurl:rewrite action="setAlarm.do"/></setAlarm>
-      <addEventRef><genurl:rewrite action="addEventRef.do"/></addEventRef>
-      <upload><genurl:rewrite action="upload.do"/></upload>
+      <initEventAlarm><genurl:rewrite action="initEventAlarm.do?b=de"/></initEventAlarm>
+      <setAlarm><genurl:rewrite action="setAlarm.do?b=de"/></setAlarm>
+      <addEventRef><genurl:rewrite action="addEventRef.do?b=de"/></addEventRef>
+      <upload><genurl:rewrite action="upload.do?b=de"/></upload>
     </logic:equal>
   </urlPrefixes>