diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereServlet.java b/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereServlet.java
index eebad94563a..0eb2bb3d1e8 100644
--- a/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereServlet.java
+++ b/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereServlet.java
@@ -432,7 +432,7 @@ public void addAtmosphereHandler(String mapping, AtmosphereHandler h) {
     private void addMapping(String path, AtmosphereHandlerWrapper w) {
         // We are using JAXRS mapping algorithm.
         if (path.contains("*")) {
-            path = path.replace("*", "[/a-zA-Z0-9-]+");
+            path = path.replace("*", "[/a-zA-Z0-9-&=;\\?]+");
         }
         atmosphereHandlers.put(path, w);