diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs
index e29c19cb1..e8cae3a63 100644
--- a/src/Handler/Course.hs
+++ b/src/Handler/Course.hs
@@ -16,7 +16,7 @@ import Data.Function ((&))
 
 import Data.Monoid (Last(..))
 
-import Data.Maybe
+import Data.Maybe (fromJust)
 import qualified Data.Set as Set
 import qualified Data.Map as Map
 
@@ -175,9 +175,9 @@ makeCourseTable whereClause colChoices psValidator = do
                        E.||. (E.castString (course E.^. CourseDescription) `E.ilike` (E.%) E.++. E.val needle E.++. (E.%))
           )
         ]
-    , dbtFilterUI = \mPrev -> mconcat
-      [ Map.singleton "search" . maybeToList <$> aopt textField (fslI MsgCourseFilterSearch) (Just <$> listToMaybe =<< Map.lookup "search" =<< mPrev)
-      , Map.singleton "registered" . fmap toPathPiece . maybeToList <$> aopt boolField (fslI MsgCourseFilterRegistered) (Just <$> fromPathPiece =<< listToMaybe =<< Map.lookup "registered" =<< mPrev)
+    , dbtFilterUI = \mPrev -> mconcat $ catMaybes
+      [ Just $ Map.singleton "search" . maybeToList <$> aopt (searchField True) (fslI MsgCourseFilterSearch) (Just <$> listToMaybe =<< Map.lookup "search" =<< mPrev)
+      , muid $> (Map.singleton "registered" . fmap toPathPiece . maybeToList <$> aopt boolField (fslI MsgCourseFilterRegistered) (Just <$> fromPathPiece =<< listToMaybe =<< Map.lookup "registered" =<< mPrev))
       ]
     , dbtStyle = def { dbsFilterLayout = defaultDBSFilterLayout }
     , dbtParams = def
diff --git a/templates/standalone/inputs.lucius b/templates/standalone/inputs.lucius
index 53b20b9cd..1d902c208 100644
--- a/templates/standalone/inputs.lucius
+++ b/templates/standalone/inputs.lucius
@@ -65,6 +65,7 @@
 
 /* TEXT INPUTS */
 input[type="text"],
+input[type="search"],
 input[type="password"],
 input[type="url"],
 input[type="number"],