diff --git a/s4-main.js b/s4-main.js
index 24d9d81..9a0c3b3 100644
--- a/s4-main.js
+++ b/s4-main.js
@@ -115,7 +115,7 @@
 	    // Select all members of the team
 	    teamsel.addEventListener("change", function(ev) {
 		var teamname = teamsel.value,
-		    selected = new RegExp('\\b'+teamname+"($|,)");
+		    selected = new RegExp('(^| )'+teamname+"($|,)");
 		usel = collectElementsByAttr("input", "name", "usel");
 		if (!usel) return;
 		for (u of usel) {