diff --git a/ietf/templates/meeting/agenda.html b/ietf/templates/meeting/agenda.html
index 01e84e3c4..028f630a0 100644
--- a/ietf/templates/meeting/agenda.html
+++ b/ietf/templates/meeting/agenda.html
@@ -93,7 +93,8 @@ img.hidden { display: none; }
     {
       weekview.setAttribute("src","week-view.html#"+frag);
       weekview.className = '';
-      ical_href.setAttribute("href","agenda.ics?"+frag);
+      ical_url = ical_href.getAttribute("href").split("?")[0];
+      ical_href.setAttribute("href",ical_url+"?"+frag);
       ical_link.className = '';
     }
     else
@@ -258,7 +259,7 @@ Updated {{ modified|date:"Y-m-d H:i:s T" }}</p>
 <p><strong>IETF agendas are subject to change, up to and during the meeting.</strong></p>
 
 {# cache this part for 15 minutes -- it takes 3-6 seconds to generate #}
-{% load cache %}{% cache 900 ietf_meeting_agenda meeting.number %}
+{% load cache %}{% cache 1 ietf_meeting_agenda meeting.number %}
 
 You can customize the agenda below to show only selected working group sessions.  To be able to return to the customized view later, bookmark the resulting URL:
 <div class="noprint" onclick="toggle_wg_selector()">
@@ -283,7 +284,7 @@ You can customize the agenda below to show only selected working group sessions.
   <tr><td align="center" colspan="{{area_list.count}}"><i>Groups displayed in italics are BOFs</i></td></tr>
 </table>
 
-<div id="ical-link" class="hidden"><span style="font-size:150%">Week View</span><br/><a id="ical-href" href="agenda.ics"><em>Download as an ical file</em></a></div>
+<div id="ical-link" class="hidden"><span style="font-size:150%">Week View</span><br/><a id="ical-href" href="{% url ietf.meeting.views.ical_agenda num=meeting.number %}"><em>Download as an ical file</em></a></div>
 
 <iframe id="weekview" class="hidden" width="100%" height="600px" src="about:blank"></iframe>
 
diff --git a/ietf/templates/meeting/list.html b/ietf/templates/meeting/list.html
index 6c374faad..8989451f3 100644
--- a/ietf/templates/meeting/list.html
+++ b/ietf/templates/meeting/list.html
@@ -30,11 +30,13 @@ Corrections to submissions cutoff date: {{ cor_cut_off_date|date:"F j, Y" }}</p>
 {% endif %}
 
 <!-- Working groups -->
-{% regroup ietf|dictsort:"group.parent.id" by group.parent.name as areas %}
+{% regroup ietf|dictsort:"group.parent.acronym" by group.parent.name as areas %}
 {% for sessions in areas %}
    <h2 class="ietf-divider">{{ sessions.grouper }}</h2>
    {% for session in sessions.list|dictsort:"group.acronym" %}
-      {% include "meeting/list_group.html" %}
+      {% ifchanged %}
+	 {% include "meeting/list_group.html" %}
+      {% endifchanged %}
    {% endfor %}
 {% endfor %}
 
@@ -42,7 +44,9 @@ Corrections to submissions cutoff date: {{ cor_cut_off_date|date:"F j, Y" }}</p>
 {% if training %}
     <h2 class="ietf-divider">Training</h2>
     {% for session in training %}
-       {% include "meeting/list_group.html" %}
+      {% ifchanged %}
+	 {% include "meeting/list_group.html" %}
+      {% endifchanged %}
     {% endfor %}
 {% endif %}
 <!-- End of Training Sessions -->
@@ -52,7 +56,9 @@ Corrections to submissions cutoff date: {{ cor_cut_off_date|date:"F j, Y" }}</p>
 {% if irtf %}
 <h2 class="ietf-divider">IRTF</h2>
     {% for session in irtf|dictsort:"group.acronym" %}
-       {% include "meeting/list_group.html" %}
+      {% ifchanged %}
+	 {% include "meeting/list_group.html" %}
+      {% endifchanged %}
     {% endfor %}
 {% endif %}
 <!-- End of IRTF Sessions -->