diff --git a/calendar/resources/content/unifinder.js b/calendar/resources/content/unifinder.js
index a4c3dba8e940..018fca5145dd 100644
--- a/calendar/resources/content/unifinder.js
+++ b/calendar/resources/content/unifinder.js
@@ -647,9 +647,7 @@ function refreshEventTree( eventArray )
          break;
 
       case "future":
-         // XXX
-         //return( gEventSource.getAllFutureEvents() );
-         EndDate = StartDate;
+         EndDate = null;
          break;
 
       case "current":
@@ -665,6 +663,9 @@ function refreshEventTree( eventArray )
    }
    var s = StartDate ? jsDateToDateTime(StartDate) : null;
    var e = EndDate ? jsDateToDateTime(EndDate) : null;
+   if (StartDate && EndDate) {
+       filter |= ccalendar.ITEM_FILTER_CLASS_OCCURRENCES;
+   }
    ccalendar.getItems (filter, 0, s, e, refreshListener);
 
 }