diff --git a/svrjs-config.json b/svrjs-config.json
index 8a2dfa0..75da1cc 100644
--- a/svrjs-config.json
+++ b/svrjs-config.json
@@ -14,19 +14,19 @@
   ],
   "rewriteMap": [
     {
-      "definingRegex": "/(\\/[^\\/.]+)\\.html?(?:$|[?#])/",
+      "definingRegex": "/(\\/[^\\/.?#]+)\\.html?(?:$|[?#])/",
       "replacements": [
         {
-          "regex": "/(\\/[^\\/.]+)\\.html?($|[?#].*)/",
+          "regex": "/(\\/[^\\/.?#]+)\\.html?($|[?#].*)/",
           "replacement": "$1.htm$2"
         }
       ]
     },
     {
-      "definingRegex": "/(\\/[^\\/.]+)(?:$|[?#])/",
+      "definingRegex": "/(\\/[^\\/.?#]+)(?:$|[?#])/",
       "replacements": [
         {
-          "regex": "/(\\/[^\\/.]+)($|[?#].*)/",
+          "regex": "/(\\/[^\\/.?#]+)($|[?#].*)/",
           "replacement": "$1.html$2"
         }
       ]