diff --git a/library/Strelka/WAI.hs b/library/Strelka/WAI.hs
--- a/library/Strelka/WAI.hs
+++ b/library/Strelka/WAI.hs
@@ -17,6 +17,7 @@
 import qualified Network.HTTP.Types as G
 import qualified Data.CaseInsensitive as H
 import qualified Data.ByteString.Builder as I
+import qualified Data.ByteString as L
 import qualified Data.HashMap.Strict as J
 import qualified Data.Text.IO as K
 
@@ -54,10 +55,7 @@
     path =
       fmap F.PathSegment (D.pathInfo waiRequest)
     query =
-      J.fromList (map row (D.queryString waiRequest))
-      where
-        row (name, value) =
-          (F.ParamName name, F.ParamValue value)
+      F.Query . maybe "" snd . L.uncons . D.rawQueryString $ waiRequest
     headers =
       J.fromList (map row (D.requestHeaders waiRequest))
       where
diff --git a/strelka-wai.cabal b/strelka-wai.cabal
--- a/strelka-wai.cabal
+++ b/strelka-wai.cabal
@@ -1,7 +1,7 @@
 name:
   strelka-wai
 version:
-  1
+  1.0.1
 synopsis:
   WAI compatibility layer for "strelka"
 homepage:
@@ -45,7 +45,7 @@
     wai >= 3.2 && < 4,
     warp >= 3.2 && < 4,
     http-types >= 0.9 && < 0.10,
-    strelka-core == 0.1.*,
+    strelka-core == 0.3.*,
     -- 
     unordered-containers == 0.2.*,
     case-insensitive >= 1 && < 2,