diff --git a/components/cardword.html b/components/cardword.html
index 74e2dff..0aad880 100644
--- a/components/cardword.html
+++ b/components/cardword.html
@@ -29,7 +29,12 @@
      <div class="h-6 bg-stone-600 rounded-b flex items-center justify-center text-white text-sm cursor-pointer"
           hx-get="/mark-card?word={{.Word}}" hx-trigger="click" hx-swap="outerHTML transition:true swap:.05s">
          {{range .Marks}}
+            {{ $length := len .Username }}
+            {{ if lt $length 3 }}
             <span class="mx-0.5">{{.Username}}</span>
+            {{else}}
+            <span class="mx-0.5">{{slice .Username 0 3}}</span>
+            {{end}}
          {{end}}
      </div>
 </div>
diff --git a/handlers/actions.go b/handlers/actions.go
index 592516b..f8590e4 100644
--- a/handlers/actions.go
+++ b/handlers/actions.go
@@ -88,12 +88,22 @@ func getFullInfoByCtx(ctx context.Context) (*models.FullInfo, error) {
 }
 
 func fillCardMarks(ctx context.Context, room *models.Room) error {
+	marks, err := repo.CardMarksByRoomID(ctx, room.ID)
+	if err != nil {
+		log.Warn("failed to fetch card marks by room_id", "room_id", room.ID, "error", err)
+		return err
+	}
 	for i, card := range room.Cards {
-		marks, err := repo.CardMarksByCardID(ctx, card.ID)
-		if err != nil {
-			return err
+		for _, mark := range marks {
+			if mark.CardID == card.ID {
+				room.Cards[i].Marks = append(room.Cards[i].Marks, mark)
+			}
 		}
-		room.Cards[i].Marks = marks
+		// marks, err := repo.CardMarksByCardID(ctx, card.ID)
+		// if err != nil {
+		// 	return err
+		// }
+		// room.Cards[i].Marks = marks
 	}
 	return nil
 }
diff --git a/models/main.go b/models/main.go
index bcccb75..0845e35 100644
--- a/models/main.go
+++ b/models/main.go
@@ -173,7 +173,7 @@ func (r *Room) FindColor(word string) (WordColor, bool) {
 }
 
 func (r *Room) ClearMarks() {
-	for i, _ := range r.Cards {
+	for i := range r.Cards {
 		r.Cards[i].Marks = []CardMark{}
 	}
 }