diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,12 @@
+0.6.0.1
+-------
+
+* Bug: Replace special symbols in query string param name
+
 0.6.0.0
 -------
 
-* PR #49. Migrate to elm-bridge and http 2.0.0
+* PR #49. Support Elm 0.19, migrate to elm-bridge, support http 2.0.0
 
 0.5.0.0
 -------
diff --git a/servant-elm.cabal b/servant-elm.cabal
--- a/servant-elm.cabal
+++ b/servant-elm.cabal
@@ -1,5 +1,5 @@
 name:                servant-elm
-version:             0.6.0.0
+version:             0.6.0.1
 synopsis:            Automatically derive Elm functions to query servant webservices.
 description:         Please see README.md
 homepage:            http://github.com/mattjbray/servant-elm#readme
diff --git a/src/Servant/Elm/Internal/Generate.hs b/src/Servant/Elm/Internal/Generate.hs
--- a/src/Servant/Elm/Internal/Generate.hs
+++ b/src/Servant/Elm/Internal/Generate.hs
@@ -306,6 +306,7 @@
 
     returnType :: Maybe Doc
     returnType = do
+      result <- fmap elmTypeRef $ request ^. F.reqReturnType
       pure ("Cmd msg")
 
 
@@ -326,7 +327,9 @@
 elmQueryArg :: F.QueryArg EType -> Doc
 elmQueryArg arg =
   "query_" <>
-  arg ^. F.queryArgName . F.argName . to (stext . F.unPathSegment)
+  arg ^. F.queryArgName . F.argName . to (stext . replace . F.unPathSegment)
+  where
+    replace = T.replace "-" "_"
 
 
 elmBodyArg :: Doc
diff --git a/test/CompileSpec.hs b/test/CompileSpec.hs
--- a/test/CompileSpec.hs
+++ b/test/CompileSpec.hs
@@ -60,17 +60,8 @@
         createDirectoryIfMissing True filePath
         TIO.writeFile fileName out
 
-        -- generateElmModuleWith
-        --   defElmOptions
-        --   ["Generated", "BooksApi"]
-        --   defElmImports
-        --   "."
-        --   [ DefineElm (Proxy :: Proxy Book)
-        --   , DefineElm (Proxy :: Proxy NoContent)
-        --   ]
-        --   (Proxy :: Proxy TestApi)
         -- -- Useful for locally checking out sources in your tmp dir
-        callCommand "cp -r . /home/kb/tmp/servelmtest"
+        -- callCommand "cp -r . /home/kb/tmp/servelmtest"
         runProcess_ "elm make Generated/BooksApi.elm --output api.js"