diff --git a/bot.py b/bot.py
index 0cb26ca..e72fe66 100644
--- a/bot.py
+++ b/bot.py
@@ -30,11 +30,11 @@ class Query:
             self.input = request_tmp[:separator_index - 1].strip()
             self.destination = request_tmp[separator_index + 4:].strip()
         else:
-            self.input = request_tmp
+            self.input = request_tmp.strip()
         if args[0].isdigit():
             self.station_id = args[0].strip()
         else:
-            self.station_id = search_station(request_tmp[:separator_index].strip())
+            self.station_id = search_station(input)
 
 
 def start(update):