diff --git a/src/program/templates/noscript_schedule_view.html b/src/program/templates/noscript_schedule_view.html
index 8ffcd497..29ed2a53 100644
--- a/src/program/templates/noscript_schedule_view.html
+++ b/src/program/templates/noscript_schedule_view.html
@@ -29,7 +29,7 @@
       <td>{{ instance.when.lower|date:"H:i" }}-{{ instance.when.upper|date:"H:i" }}</td>
       <td>
         <i class="fas fa-video{% if not instance.event.video_recording %}-slash{% endif %}"></i>
-        <a href="{% url 'program:event_detail' camp_slug=camp.slug slug=instance.event.slug %}">{{ instance.event.title }}</a>
+        <a href="{% url 'program:event_detail' camp_slug=camp.slug event_slug=instance.event.slug %}">{{ instance.event.title }}</a>
       </td>
       <td>{{ instance.location.name }}</td>
       <td>{{ instance.event.event_type }}</td>
diff --git a/src/program/views.py b/src/program/views.py
index 69c1b519..2de7f211 100644
--- a/src/program/views.py
+++ b/src/program/views.py
@@ -803,9 +803,11 @@ class NoScriptScheduleView(CampViewMixin, TemplateView):
 
     def get_context_data(self, *args, **kwargs):
         context = super().get_context_data(**kwargs)
-        context["eventinstances"] = models.EventInstance.objects.filter(
-            event__track__camp=self.camp
-        ).order_by("when")
+        context["eventinstances"] = (
+            models.EventInstance.objects.filter(event__track__camp=self.camp)
+            .prefetch_related("location", "event__event_type")
+            .order_by("when")
+        )
         return context