diff --git a/app/Http/Controllers/CalendarController.php b/app/Http/Controllers/CalendarController.php
index cf11a0d1..a140c23d 100644
--- a/app/Http/Controllers/CalendarController.php
+++ b/app/Http/Controllers/CalendarController.php
@@ -17,7 +17,7 @@ class CalendarController extends Controller
 
     public function overview(Request $request)
     {
-        $apiResult = $this->API('agenda/overzicht');
+        $apiResult = $this->API('agenda/overzicht?aantal=100');
         $calendar = [];
         foreach($apiResult->events as $calendarItem)
         {
diff --git a/resources/views/calendarlist.blade.php b/resources/views/calendarlist.blade.php
index 87ab1217..d98ca667 100644
--- a/resources/views/calendarlist.blade.php
+++ b/resources/views/calendarlist.blade.php
@@ -55,7 +55,7 @@
                                         <div class="sub_title" style="flex-wrap: wrap">
                         <ul class="post_tags" style="width: 100%; margin: 0 0 8px 0;height: 25px;">
                         @foreach($event->tags as $tag)
-                        <li><a style="padding: 3px 8px 3px" title="{{$tag->title}}">{{$tag->title}}</a></li>
+                        <li><a style="padding: 3px 8px 3px" title="{{$tag->titel}}">{{$tag->titel}}</a></li>
                                                 @endforeach
                                             </ul>
                                             <span class="post_date" style="line-height: 1.17; height: 14px;" title="{{Formatter::relativeDate($event->starts, 'W d m y?')}}">
@@ -63,8 +63,10 @@
                                                 @if($event->ends && $event->starts != $event->ends)
                                                     @if($event->ends->format('d M y') != $event->starts->format('d M y'))
                                                         t/m {{strtolower(Formatter::relativeDate($event->ends, 'W d m y?'))}}
-                                                    @else
+                                                    @elseif($event->ends)
                                                         van {{ $event->starts->format('H:i') }} uur tot {{ $event->ends->format('H:i') }} uur 
+                                                    @else
+                                                        om {{ $event->starts->format('H:i') }} uur
                                                     @endif
                                                 @endif
                                             </span>