diff --git a/views.go b/views.go
index 5a8eafb..83b7774 100644
--- a/views.go
+++ b/views.go
@@ -104,33 +104,31 @@ func viewScoreboard(c *gin.Context) {
 
 	teams, round, err := dbGetScoreboard()
 
-    room := c.Query("room")
-	if room != "" {
-		filteredTeams := []TeamData{}
-		for _, team := range teams {
-			if room == "187" && team.ID >= 1 && team.ID <= 8 {
-				filteredTeams = append(filteredTeams, team)
-			}
-			if room == "188" && team.ID >= 9 && team.ID <= 15 {
-				filteredTeams = append(filteredTeams, team)
-			}
-			if room == "260" && team.ID >= 16 && team.ID <= 22 {
-				filteredTeams = append(filteredTeams, team)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, err.Error())
+		return
+	}
+
+	team_range_start := c.Query("team_range_start")
+	team_range_end := c.Query("team_range_end")
+
+	if team_range_start != "" && team_range_end != "" {
+		lo, errLo := strconv.Atoi(team_range_start)
+		hi, errHi := strconv.Atoi(team_range_end)
+
+		if errLo == nil && errHi == nil {
+			filteredTeams := []TeamData{}
+			for _, team := range teams {
+				if team.ID >= lo && team.ID <= hi {
+					filteredTeams = append(filteredTeams, team)
+				}
 			}
+			teams = filteredTeams
 		}
-		teams = filteredTeams
-	}
-	
-	for _, team := range teams {
-		errorPrint(team.ID)
 	}
 
 	for _, team := range teams {
-        errorPrint(team.ID)
-    }
-	if err != nil {
-		c.JSON(http.StatusInternalServerError, err.Error())
-		return
+		errorPrint(team.ID)
 	}
 
 	services := make([]string, 0)