diff --git a/src/Application.hs b/src/Application.hs
index d1d7195f2..001d87096 100644
--- a/src/Application.hs
+++ b/src/Application.hs
@@ -709,9 +709,4 @@ addPWEntry :: User
 addPWEntry User{ userAuthentication = _, ..} (Text.encodeUtf8 -> pw) = db' $ do
   PWHashConf{..} <- getsYesod $ view _appAuthPWHash
   (AuthPWHash . Text.decodeUtf8 -> userAuthentication) <- liftIO $ makePasswordWith pwHashAlgorithm pw pwHashStrength
-  void $ insert User{..}
-
-
-
-
-
+  void $ insert User{..}
\ No newline at end of file
diff --git a/src/Handler/Material.hs b/src/Handler/Material.hs
index 81aa47187..5f095626a 100644
--- a/src/Handler/Material.hs
+++ b/src/Handler/Material.hs
@@ -81,16 +81,6 @@ fetchMaterial tid ssh csh mnm =
 
 getMaterialListR :: TermId -> SchoolId -> CourseShorthand -> Handler Html
 getMaterialListR tid ssh csh = do
-  cid <- runDB . getKeyBy404 $ TermSchoolCourseShort tid ssh csh
-  let typeOptions :: HandlerFor UniWorX (OptionList Text)
-      typeOptions = do
-        previouslyUsed <- runDB $
-          E.select $ E.from $ \material ->
-            E.distinctOnOrderBy [E.asc $ material E.^. MaterialType] $ do
-              E.where_ $ material E.^. MaterialCourse E.==. E.val cid
-                   E.&&. E.not_ (E.isNothing $ material E.^. MaterialType)
-              return $ material E.^. MaterialType
-        return . mkOptionList . map (\(CI.original -> t) -> Option t t t) . Set.toAscList . Set.fromList $ mapMaybe E.unValue previouslyUsed
   let matLink :: MaterialName -> Route UniWorX
       matLink = CourseR tid ssh csh . flip MaterialR MShowR
 
@@ -107,6 +97,16 @@ getMaterialListR tid ssh csh = do
   seeAllModificationTimestamps <- hasWriteAccessTo $ CourseR tid ssh csh MaterialNewR -- ordinary users should not see modification dates older than visibility
   MsgRenderer mr <- getMsgRenderer
   table <- runDB $ do
+    cid <- getKeyBy404 $ TermSchoolCourseShort tid ssh csh
+    let typeOptions :: HandlerFor UniWorX (OptionList Text)
+        typeOptions = do
+          previouslyUsed <- runDB $
+            E.select $ E.from $ \material ->
+              E.distinctOnOrderBy [E.asc $ material E.^. MaterialType] $ do
+                E.where_ $ material E.^. MaterialCourse E.==. E.val cid
+                    E.&&. E.not_ (E.isNothing $ material E.^. MaterialType)
+                return $ material E.^. MaterialType
+          return . mkOptionList $ map (\t -> Option t t t) (map CI.original (Set.toAscList (Set.fromList (mapMaybe E.unValue previouslyUsed))))
     let row2material = view $ _dbrOutput . _1 . _entityVal
         psValidator  = def & defaultSorting [SortDescBy "last-edit"]
                            & forceFilter "may-access" (Any True)
@@ -148,9 +148,9 @@ getMaterialListR tid ssh csh = do
             , ( "last-edit"    , SortColumn (E.^. MaterialLastEdit)    )
             ]
       , dbtFilter    = mconcat
-        [ singletonMap "may-access" . mkFilterProjectedPost $ \(Any b) dbr
-            -> (== b) <$> hasReadAccessTo (matLink . materialName $ row2material dbr) :: DB Bool
-        , (singletonMap "searchName" . FilterColumn $ \material criterion -> case getLast (criterion :: Last Text) of
+        [ (singletonMap "may-access" . mkFilterProjectedPost $ \(Any b) dbr
+            -> (== b) <$> hasReadAccessTo (matLink . materialName $ row2material dbr) :: DB Bool)
+        , (singletonMap "searchName". FilterColumn $ \material criterion -> case getLast (criterion :: Last Text) of
               Nothing -> E.val True :: E.SqlExpr (E.Value Bool)
               Just needle -> (E.castString (material E.^. MaterialName) `E.ilike` (E.%) E.++. E.val needle E.++. (E.%)))  
         , (singletonMap "searchTypeAndDescription". FilterColumn $ \material criterion -> case getLast (criterion :: Last Text) of