diff --git a/evaluator/evaluator.go b/evaluator/evaluator.go
index 5b193fc..7106587 100644
--- a/evaluator/evaluator.go
+++ b/evaluator/evaluator.go
@@ -66,9 +66,11 @@ func parseBang(searchQuery string) (bang string, query string) {
 
 func evaluateBang(searchQuery string, searchEngine string) (query string, engine string) {
 	bang, query := parseBang(searchQuery)
-	if bang == "" {
-		return query, searchEngine
+	engine = bangs[bang]
+
+	if (bang == "" || engine == ""){
+		return searchQuery, searchEngine
 	} else {
-		return query, bangs[bang]
+		return query, engine
 	}
 }