diff --git a/src/route.sh b/src/route.sh
index 455256e..701caa0 100755
--- a/src/route.sh
+++ b/src/route.sh
@@ -4,6 +4,6 @@
 # router(uri, path)
 function router() {
 	route+=("$1")
-	route+=("$(sed -E 's/:[A-Za-z0-9]+/[A-Za-z0-9.,%:-_]+/g' <<< "$1")")
+	route+=("$(sed -E 's/:[A-Za-z0-9]+/[A-Za-z0-9.,%:\\-_]+/g' <<< "$1")")
 	route+=("$2")
 }
diff --git a/src/server.sh b/src/server.sh
index 48fd11e..9d38ba0 100755
--- a/src/server.sh
+++ b/src/server.sh
@@ -123,8 +123,8 @@ echo "$(date) - IP: ${r[ip]}, PROTO: ${r[proto]}, URL: ${r[url]}, GET_data: ${ge
 [[ -f "${cfg[namespace]}/routes.sh" ]] && source "${cfg[namespace]}/routes.sh"
 
 if [[ ${r[status]} != 101 ]]; then
+	clean_url="$(sed -E 's/\?.*//' <<< "${r[url]}")"
 	for (( i=0; i<${#route[@]}; i=i+3 )); do
-		clean_url="$(grep -Poh '.*?\?' <<< "${r[url]}")"
 		if [[ "$(grep -Poh "^${route[$((i+1))]}$" <<< "$clean_url")" != "" ]] || [[ "$(grep -Poh "^${route[$((i+1))]}$" <<< "$clean_url/")" != "" ]]; then
 			r[status]=212
 			r[view]="${route[$((i+2))]}"