diff --git a/admin/static/views/team-edit.html b/admin/static/views/team-edit.html
index eb230e06..9053bdf3 100644
--- a/admin/static/views/team-edit.html
+++ b/admin/static/views/team-edit.html
@@ -104,7 +104,7 @@
 
 </div>
 
-<div class="col-lg-4">
+<div class="col-lg-4" style="overflow-y: scroll; height: 95vh">
   <table ng-controller="TeamHistoryController" class="table table-hover table-striped table-bordered bg-primary text-light">
     <tbody>
       <tr ng-repeat="row in history" ng-class="{'bg-ffound': row.kind == 'flag_found', 'bg-mfound': row.kind == 'mcq_found', 'bg-wchoices': row.kind == 'wchoices', 'bg-success': row.kind == 'solved', 'bg-info': row.kind == 'hint', 'bg-warning': row.kind == 'tries'}">
@@ -118,7 +118,7 @@
 	  <span ng-if="!row.primary_title">{{ row.primary }}</span>
 	  <span ng-if="row.secondary_title">
 	    :
-	    <a href="exercices/{{ row.primary }}#key-{{ row.secondary }}" ng-if="row.kind == 'key_found'">{{ row.secondary_title }}</a>
+	    <a href="exercices/{{ row.primary }}#key-{{ row.secondary }}" ng-if="row.kind == 'flag_found' || row.kind == 'wchoices'">{{ row.secondary_title }}</a>
 	    <a href="exercices/{{ row.primary }}#quizz-{{ row.secondary }}" ng-if="row.kind == 'mcq_found'">{{ row.secondary_title }}</a>
 	    <a href="exercices/{{ row.primary }}#hint-{{ row.secondary }}" ng-if="row.kind == 'hint'">{{ row.secondary_title }}</a>
 	  </span>
diff --git a/libfic/team_history.go b/libfic/team_history.go
index b7bf484c..8a2cb581 100644
--- a/libfic/team_history.go
+++ b/libfic/team_history.go
@@ -62,7 +62,7 @@ func (t Team) DelHistoryItem(kind string, h time.Time, primary *int64, secondary
 		} else {
 			return nb, err
 		}
-	} else if kind == "hint" && primary != nil {
+	} else if kind == "hint" && primary != nil && secondary != nil {
 		if res, err := DBExec("DELETE FROM team_hints WHERE id_team = ? AND time = ? AND id_hint = ?", t.Id, h, *secondary); err != nil {
 			return 0, err
 		} else if nb, err := res.RowsAffected(); err != nil {
@@ -70,7 +70,7 @@ func (t Team) DelHistoryItem(kind string, h time.Time, primary *int64, secondary
 		} else {
 			return nb, err
 		}
-	} else if kind == "wchoices" && primary != nil {
+	} else if kind == "wchoices" && primary != nil && secondary != nil {
 		if res, err := DBExec("DELETE FROM team_wchoices WHERE id_team = ? AND time = ? AND id_flag = ?", t.Id, h, *secondary); err != nil {
 			return 0, err
 		} else if nb, err := res.RowsAffected(); err != nil {
@@ -78,7 +78,7 @@ func (t Team) DelHistoryItem(kind string, h time.Time, primary *int64, secondary
 		} else {
 			return nb, err
 		}
-	} else if kind == "flag_found" && secondary != nil {
+	} else if kind == "flag_found" && primary != nil && secondary != nil {
 		if res, err := DBExec("DELETE FROM flag_found WHERE id_team = ? AND time = ? AND id_flag = ?", t.Id, h, *secondary); err != nil {
 			return 0, err
 		} else if nb, err := res.RowsAffected(); err != nil {
@@ -86,7 +86,7 @@ func (t Team) DelHistoryItem(kind string, h time.Time, primary *int64, secondary
 		} else {
 			return nb, err
 		}
-	} else if kind == "mcq_found" && secondary != nil {
+	} else if kind == "mcq_found" && primary != nil && secondary != nil {
 		if res, err := DBExec("DELETE FROM mcq_found WHERE id_team = ? AND time = ? AND id_mcq = ?", t.Id, h, *secondary); err != nil {
 			return 0, err
 		} else if nb, err := res.RowsAffected(); err != nil {