diff --git a/site/layouts/index.html b/site/layouts/index.html
index 0b7c045..c8060c6 100644
--- a/site/layouts/index.html
+++ b/site/layouts/index.html
@@ -1,6 +1,6 @@
 {{ partial "header" . }}
 
-{{ $incidents := where .Site.Pages.ByDate.Reverse "Section" "incidents" }}
+{{ $incidents := where .Site.RegularPages.ByDate.Reverse "Section" "incidents" }}
 {{ $active := where $incidents "Params.resolved" "!=" true }}
 
 {{ partial "systems" (dict "content" . "incidents" $active) }}
diff --git a/site/layouts/partials/incident.html b/site/layouts/partials/incident.html
index 3879b84..baf8baf 100644
--- a/site/layouts/partials/incident.html
+++ b/site/layouts/partials/incident.html
@@ -6,9 +6,10 @@
   <div class="incident-description">
     {{- .Content -}}
   </div>
-  {{- $alert := index .Site.Data.severity.alerts .Params.severity -}}
+  {{- $severity := .Params.severity  | default "under-maintenance" -}}
+  {{- $alert := index .Site.Data.severity.alerts $severity -}}
 
   <p class="incident-status color-{{ $alert }}">
-    {{ index .Site.Data.severity.descriptions .Params.severity }}
+    {{ index .Site.Data.severity.descriptions $severity }}
   </p>
 </div>