diff --git a/deploy.sh b/deploy.sh
index 779363d..da71e97 100644
--- a/deploy.sh
+++ b/deploy.sh
@@ -5,8 +5,6 @@ win32id="$(echo "$response" | grep -B 1 \"BloodHound-linux-ia32 | head -n1 | cut
 x64id="$(echo "$response" | grep -B 1 \"BloodHound-linux-x64 | head -n1 | cut -d ":" -f 2 | cut -c 2- | sed 's/.$//')"
 macid="$(echo "$response" | grep -B 1 \"BloodHound-darwin-x64 | head -n1 | cut -d ":" -f 2 | cut -c 2- | sed 's/.$//')"
 
-echo $response
-
 if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
 	if [[ ! $win32id == "" ]]; then
 		curl -s -X DELETE --user "${GH_USER}" https://api.github.com/repos/adaptivethreat/BloodHound/releases/assets/$win32id
diff --git a/src/components/SearchContainer/Tabs/PrebuiltQueries.json b/src/components/SearchContainer/Tabs/PrebuiltQueries.json
index 1844197..ce69c82 100644
--- a/src/components/SearchContainer/Tabs/PrebuiltQueries.json
+++ b/src/components/SearchContainer/Tabs/PrebuiltQueries.json
@@ -47,7 +47,7 @@
 			"requireNodeSelect": true,
 			"nodeSelectQuery": {
 				"query": "MATCH (n:Domain) RETURN n",
-				"onFinish": "MATCH (n:User) WHERE n.name ENDS WITH '{}' WITH n MATCH (n)-[r:MemberOf*1..]->(m:Group) WHERE NOT m.name ENDS WITH '{}' RETURN n,r,m",
+				"onFinish": "MATCH (n:User) WHERE n.name ENDS WITH ('@' + '{}') WITH n MATCH (n)-[r:MemberOf]->(m:Group) WHERE NOT m.name ENDS WITH ('@' + '{}') RETURN n,r,m",
 				"start": "{}",
 				"end": "",
 				"allowCollapse": false,
@@ -59,7 +59,7 @@
 			"requireNodeSelect": true,
 			"nodeSelectQuery": {
 				"query": "MATCH (n:Domain) RETURN n",
-				"onFinish": "MATCH (n:Group) WHERE n.name ENDS WITH '{}' WITH n MATCH (n)-[r:MemberOf*1..]->(m:Group) WHERE NOT m.name ENDS WITH '{}' RETURN n,r,m",
+				"onFinish": "MATCH (n:Group) WHERE n.name ENDS WITH ('@' + '{}') WITH n MATCH (n)-[r:MemberOf*1..]->(m:Group) WHERE NOT m.name ENDS WITH ('@' + '{}') RETURN n,r,m",
 				"start": "{}",
 				"end": "",
 				"allowCollapse": false,