diff --git a/src/Handler/School/DayTasks.hs b/src/Handler/School/DayTasks.hs
index 3bec3d289..5e6d8ba4e 100644
--- a/src/Handler/School/DayTasks.hs
+++ b/src/Handler/School/DayTasks.hs
@@ -43,6 +43,7 @@ data DailyTableActionData  = DailyActDummyData
   deriving (Eq, Ord, Read, Show, Generic)
 
 -- | partial JSON object to be used for filtering with "@>"
+--   ensure that a GIN index for the jsonb column is created in Model.Migration.Definitions
 occurrenceDayValue :: Day -> Value
 occurrenceDayValue d = Aeson.object
   [ "exceptions" Aeson..=
@@ -50,7 +51,6 @@ occurrenceDayValue d = Aeson.object
       [ "exception" Aeson..= ("occur"::Text)
       , "day"       Aeson..= d
   ] ] ]
--- TODO: ensure that an appropriate GIN index for the jsonb column is set
 
 {- More efficient DB-only version, but ignores regular schedules
 getDayTutorials :: SchoolId -> Day -> DB [TutorialId]
@@ -87,8 +87,8 @@ getDayTutorials ssh dlimit@(dstart, dend )
   where
     period = Set.fromAscList [dstart..dend]
 
-    -- TODO: checkCandidate (_, Entity{entityKey=tutId}, E.unValue -> True) = Just tutId -- common case
-    checkCandidate (Entity{entityVal=trm}, Entity{entityKey=tutId, entityVal=Tutorial{tutorialTime=JSONB occ}},_)
+    checkCandidate (_, Entity{entityKey=tutId}, E.unValue -> True) = Just tutId -- most common case
+    checkCandidate (Entity{entityVal=trm}, Entity{entityKey=tutId, entityVal=Tutorial{tutorialTime=JSONB occ}}, _)
       | not $ Set.null $ Set.intersection period $ occurrencesCompute' trm occ
         = Just tutId
       | otherwise
diff --git a/src/Model/Migration/Definitions.hs b/src/Model/Migration/Definitions.hs
index 0f45bda71..6c7da942a 100644
--- a/src/Model/Migration/Definitions.hs
+++ b/src/Model/Migration/Definitions.hs
@@ -100,6 +100,8 @@ migrateManual = do
     , ("idx_lms_report_log_q_ident_time"     ,"CREATE INDEX idx_lms_report_log_q_ident_time ON \"lms_report_log\" (\"qualification\",\"ident\",\"timestamp\")")
     , ("idx_user_company_company"            ,"CREATE INDEX idx_user_company_company ON \"user_company\" (\"company\")") -- composed index from unique cannot be used for frequently used filters on company
     , ("idx_user_supervisor_user"            ,"CREATE INDEX idx_user_supervisor_user ON \"user_supervisor\" (\"user\")") -- composed index from unique cannot be used for frequently used filters on user
+    , ("idx_tutorial_time"                   ,"CREATE INDEX idx_tutorial_time ON \"tutorial\" USING GIN (\"time\")")            -- GIN Index to speed up filtering with @>.
+    , ("idx_course_event_time"               ,"CREATE INDEX idx_course_event_time ON \"course_event\" USING GIN (\"time\")")    -- GIN Index to speed up filtering with @>.
     ]
   where
     addIndex :: Text -> Sql -> Migration