diff --git a/frontend/telegram_bot.go b/frontend/telegram_bot.go
index 949ed13..a43fd76 100644
--- a/frontend/telegram_bot.go
+++ b/frontend/telegram_bot.go
@@ -78,6 +78,7 @@ func webHandlerTelegramBot(w http.ResponseWriter, r *http.Request) {
 	target := ""
 	if strings.Contains(request.Message.Text, " ") {
 		target = strings.Join(strings.Split(request.Message.Text, " ")[1:], " ")
+		target = strings.TrimSpace(target)
 	}
 
 	// Execute command
diff --git a/frontend/webserver.go b/frontend/webserver.go
index bffa444..d56f8df 100644
--- a/frontend/webserver.go
+++ b/frontend/webserver.go
@@ -43,6 +43,7 @@ func webBackendCommunicator(endpoint string, command string) func(w http.Respons
 		} else {
 			backendCommand = backendCommandPrimitive
 		}
+		backendCommand = strings.TrimSpace(backendCommand)
 
 		templateHeader(w, r, "Bird-lg Go - "+html.EscapeString(endpoint+" "+backendCommand))
 
diff --git a/proxy/traceroute.go b/proxy/traceroute.go
index ec291ac..9a44ad0 100644
--- a/proxy/traceroute.go
+++ b/proxy/traceroute.go
@@ -5,6 +5,7 @@ import (
 	"net/http"
 	"os/exec"
 	"runtime"
+	"strings"
 )
 
 // Wrapper of traceroute, IPv4
@@ -33,6 +34,7 @@ func tracerouteTryExecute(cmd []string, args [][]string) ([]byte, error) {
 // Real handler of traceroute requests
 func tracerouteRealHandler(useIPv6 bool, httpW http.ResponseWriter, httpR *http.Request) {
 	query := string(httpR.URL.Query().Get("q"))
+	query = strings.TrimSpace(query)
 	if query == "" {
 		invalidHandler(httpW, httpR)
 	} else {