diff --git a/named-servant-server.cabal b/named-servant-server.cabal
--- a/named-servant-server.cabal
+++ b/named-servant-server.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 name: named-servant-server
-version: 0.1.1
+version: 0.2.0
 maintainer: kristof@resonata.be
 copyright: Kristof Bastiaensen 2020
 synopsis: server support for named-servant
@@ -24,6 +24,6 @@
         base >= 4.7 && < 5,
         servant >= 0.17 && < 0.18,
         servant-server >= 0.17 && < 0.18,
-        named-servant == 0.1.1,
+        named-servant == 0.2.0,
         named >= 0.3 && < 0.4,
         text
diff --git a/src/Servant/Server/Named.hs b/src/Servant/Server/Named.hs
--- a/src/Servant/Server/Named.hs
+++ b/src/Servant/Server/Named.hs
@@ -68,11 +68,11 @@
       => HasServer (NamedQueryFlag sym :> api) context where
 
   type ServerT (NamedQueryFlag sym :> api) m =
-    sym :! Bool -> ServerT api m
+    sym :? Bool -> ServerT api m
 
   hoistServerWithContext _ pc nt s =
     hoistServerWithContext (Proxy :: Proxy api) pc nt . s
 
   route Proxy context subserver =
     route (Proxy :: Proxy (QueryFlag sym :> api)) context $
-    fmap (\f -> f . Arg) subserver
+    fmap (\f -> f . ArgF . Just) subserver