diff --git a/src/ATrade/MDS/HistoryServer.hs b/src/ATrade/MDS/HistoryServer.hs
index 9cc859d..c452944 100644
--- a/src/ATrade/MDS/HistoryServer.hs
+++ b/src/ATrade/MDS/HistoryServer.hs
@@ -85,7 +85,10 @@ serveQHP db sock = forever $ do
 
     chunkSize = 4096
 
-    replaceWildcards = T.map (\x -> if x == '?' then '_' else x)
+    replaceWildcards = T.map mapWildcard
+    mapWildcard '?' = '_'
+    mapWildcard '*' = '%'
+    mapWildcard x   = x
 
 serveHAP :: (Sender a, Receiver a) => MdsHandle -> Socket a -> IO ()
 serveHAP db sock = forever $ do