diff --git a/main.go b/main.go
index 2b0b897..25dfe17 100644
--- a/main.go
+++ b/main.go
@@ -103,8 +103,19 @@ func (h *stopInfoHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if r.FormValue("exact") != "true" {
-		searchQuery = "%" + searchQuery + "%"
+	var searchQueries = strings.Split(searchQuery, " ")
+
+	for i, query := range searchQueries {
+		if i == 0 {
+			// Parse whether result shall be exact
+			if r.FormValue("contains") != "true" {
+				searchQueries[0] = "%" + query + "%"
+			} else {
+				searchQueries[0] = query + "%"
+			}
+		} else {
+			searchQueries[i] = "%" + query + "%"
+		}
 	}
 
 	var longDistance pgtype.Bool