diff --git a/jstrr.js b/jstrr.js
index 6fb3bfd..f5e342e 100644
--- a/jstrr.js
+++ b/jstrr.js
@@ -352,10 +352,27 @@
 	}
 	switchToArea(0);
     }
+    function filterSameTeam(e) {
+	e.stopPropagation();
+	let tbl = document.getElementById("ranking-table");
+	let team = e.target.textContent, body = document.body;
+	mystate.collapsed = !mystate.collapsed;
+	let visible = mystate.collapsed ? "collapse" : "visible";
+	for (let tr of document.querySelectorAll("tr")) {
+	    tr.style.visibility =
+		tr.classList.contains(team) ? "visible" : visible;
+	}
+	if (mystate.collapsed)
+	    tbl.addEventListener("click", filterSameTeam);
+	else
+	    tbl.removeEventListener("click", filterSameTeam);
+    }
     function showRank(list) {
-	mystate["ranklist"] = list;
+	mystate.ranklist = list;
+	mystate.collapsed = false;
 	// user, max(score), max(step), count(score), sum(time)/60, max(at)
-	let tbl = document.getElementById("ranking-table"), me;
+	let tbl = document.getElementById("ranking-table"), me, teamcol,
+	    rankinteam = {};
 	if (false) {
 	    for (let i=0; i<40; i++) {
 		let tr = document.createElement("tr")
@@ -366,15 +383,31 @@
 	for (let i in list) {
 	    let tr   = document.createElement("tr"),
 		rank = document.createElement("th");
-	    if (i>0) rank.textContent = parseInt(i);
+	    if (i==0) {				// Header row
+		if (list.mode == null) {
+		    for (let c in list[i])
+			if (list[i][c] == "Team") {
+			    teamcol = c
+			    break;
+			}
+		}
+	    } else {
+		rank.textContent = parseInt(i);	// for contents rows
+	    }
 	    tr.appendChild(rank);
 	    for (let j=0; j<list[i].length; j++) {
 		let td = document.createElement(i==0?"th":"td");
 		td.textContent = list[i][j];
 		tr.appendChild(td);
+		if (j == teamcol) {
+		    let tm = list[i][j];
+		    tr.classList.add(tm);
+		    td.addEventListener("click", filterSameTeam);
+		    if (!rankinteam[tm]) rankinteam[tm] = 0;
+		    td.title = (++rankinteam[tm]) + " in "+tm;
+		}
 	    }
 	    tbl.appendChild(tr);
-	    console.log("MU="+mystate.user+", "+list[i][0]);
 	    if (mystate.user == list[i][0]) me = tr;
 	}
 	if (me) {
@@ -387,8 +420,8 @@
     }
     function downloadCSV(ev) {
 	ev.stopPropagation();
-	if (!mystate["ranklist"]) return;
-	let list = mystate["ranklist"],
+	if (!mystate.ranklist) return;
+	let list = mystate.ranklist,
 	    mode = mystate["rankmode"],
 	    str="";
 	    text = textlist[nArea]["file"];
@@ -534,7 +567,7 @@
 	    }, false);
 	}
 	let text = textlist[nArea].file;
-	mystate["ranklist"] = null; // Clear ranking list
+	mystate.ranklist = null; // Clear ranking list
 	let request = {ranking: text};
 	if (mode) request["mode"] = mode;
 	sendJSONtoServer(request);