diff --git a/models/models.go b/models/models.go
index 2d9b59f..ef5386f 100644
--- a/models/models.go
+++ b/models/models.go
@@ -45,11 +45,11 @@ type RaceResult struct {
 
 // Heat represents a single race with 4 lanes
 type Heat struct {
-	ID      int64 `json:"id"`
-	GroupID int64 `json:"group_id"`
-	HeatNum int   `json:"heat_num"`
-	Lane1ID int64 `json:"lane1_id"`
-	Lane2ID int64 `json:"lane2_id"`
-	Lane3ID int64 `json:"lane3_id"`
-	Lane4ID int64 `json:"lane4_id"`
+	ID      int64  `json:"id"`
+	GroupID int64  `json:"group_id"`
+	HeatNum int    `json:"heat_num"`
+	Lane1ID *int64 `json:"lane1_id"`
+	Lane2ID *int64 `json:"lane2_id"`
+	Lane3ID *int64 `json:"lane3_id"`
+	Lane4ID *int64 `json:"lane4_id"`
 }
diff --git a/web/server.go b/web/server.go
index f36d7e7..021f440 100644
--- a/web/server.go
+++ b/web/server.go
@@ -814,10 +814,10 @@ func (s *Server) handleHeatsContent() http.HandlerFunc {
 			for i, h := range derbyHeats {
 				heats[i] = models.Heat{
 					HeatNum: i + 1,
-					Lane1ID: *h.Lane1ID,
-					Lane2ID: *h.Lane2ID,
-					Lane3ID: *h.Lane3ID,
-					Lane4ID: *h.Lane4ID,
+					Lane1ID: h.Lane1ID,
+					Lane2ID: h.Lane2ID,
+					Lane3ID: h.Lane3ID,
+					Lane4ID: h.Lane4ID,
 				}
 			}
 		}
diff --git a/web/templates/heats.templ b/web/templates/heats.templ
index 9702a10..02ca67b 100644
--- a/web/templates/heats.templ
+++ b/web/templates/heats.templ
@@ -69,10 +69,10 @@ templ HeatsContent(heats []models.Heat, racers []models.Racer) {
 					for i, heat := range heats {
 						<tr>
 							<td>{ strconv.Itoa(i + 1) }</td>
-							<td>{ getRacerName(racers, heat.Lane1ID) }</td>
-							<td>{ getRacerName(racers, heat.Lane2ID) }</td>
-							<td>{ getRacerName(racers, heat.Lane3ID) }</td>
-							<td>{ getRacerName(racers, heat.Lane4ID) }</td>
+							<td>{ getRacerName(racers, *heat.Lane1ID) }</td>
+							<td>{ getRacerName(racers, *heat.Lane2ID) }</td>
+							<td>{ getRacerName(racers, *heat.Lane3ID) }</td>
+							<td>{ getRacerName(racers, *heat.Lane4ID) }</td>
 						</tr>
 					}
 				</tbody>
diff --git a/web/templates/heats_templ.go b/web/templates/heats_templ.go
index 35059a4..b56a09e 100644
--- a/web/templates/heats_templ.go
+++ b/web/templates/heats_templ.go
@@ -167,9 +167,9 @@ func HeatsContent(heats []models.Heat, racers []models.Racer) templ.Component {
 					return templ_7745c5c3_Err
 				}
 				var templ_7745c5c3_Var7 string
-				templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(getRacerName(racers, heat.Lane1ID))
+				templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(getRacerName(racers, *heat.Lane1ID))
 				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/heats.templ`, Line: 72, Col: 47}
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/heats.templ`, Line: 72, Col: 48}
 				}
 				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
 				if templ_7745c5c3_Err != nil {
@@ -180,9 +180,9 @@ func HeatsContent(heats []models.Heat, racers []models.Racer) templ.Component {
 					return templ_7745c5c3_Err
 				}
 				var templ_7745c5c3_Var8 string
-				templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(getRacerName(racers, heat.Lane2ID))
+				templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(getRacerName(racers, *heat.Lane2ID))
 				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/heats.templ`, Line: 73, Col: 47}
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/heats.templ`, Line: 73, Col: 48}
 				}
 				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
 				if templ_7745c5c3_Err != nil {
@@ -193,9 +193,9 @@ func HeatsContent(heats []models.Heat, racers []models.Racer) templ.Component {
 					return templ_7745c5c3_Err
 				}
 				var templ_7745c5c3_Var9 string
-				templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(getRacerName(racers, heat.Lane3ID))
+				templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(getRacerName(racers, *heat.Lane3ID))
 				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/heats.templ`, Line: 74, Col: 47}
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/heats.templ`, Line: 74, Col: 48}
 				}
 				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
 				if templ_7745c5c3_Err != nil {
@@ -206,9 +206,9 @@ func HeatsContent(heats []models.Heat, racers []models.Racer) templ.Component {
 					return templ_7745c5c3_Err
 				}
 				var templ_7745c5c3_Var10 string
-				templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(getRacerName(racers, heat.Lane4ID))
+				templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(getRacerName(racers, *heat.Lane4ID))
 				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/heats.templ`, Line: 75, Col: 47}
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `web/templates/heats.templ`, Line: 75, Col: 48}
 				}
 				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10))
 				if templ_7745c5c3_Err != nil {