diff --git a/themes/nluug/layouts/index.html b/themes/nluug/layouts/index.html
index 85215dd..0aaae83 100644
--- a/themes/nluug/layouts/index.html
+++ b/themes/nluug/layouts/index.html
@@ -28,9 +28,7 @@
 
   <h2>Aankomende evenementen</h2>
 
-    {{ $upcoming_events := .Site.Data.evenementen.kalender }}
-    {{ $upcoming_events := sort $upcoming_events ".date_start" "asc" }}
-
+    {{ $upcoming_events := sort .Site.Data.evenementen.kalender "date_start" "asc" }}
     {{ range $upcoming_events }}
       {{ if eq .highlight_on_homepage true }}
         <div class="highlight-box">
@@ -44,7 +42,7 @@
 
   <p>Naast de door ons georganiseerde evenementen staat er meer op de agenda. Zie de uitgebreide evenementenkalender voor meer details.</p>
     <ul>
-      {{ range first 10 $upcoming_events }}
+      {{ range first 10 (where $upcoming_events "date_start" "gt" (dateFormat "2006-01-02" now)) }}
         <li>{{ .date_start | dateFormat "02-01-2006" }} - {{ .name }}</li>
       {{ end }}
     </ul>