diff --git a/TASVideos/Pages/Search/Index.cshtml b/TASVideos/Pages/Search/Index.cshtml
index 2b006cacf..70cc5b039 100644
--- a/TASVideos/Pages/Search/Index.cshtml
+++ b/TASVideos/Pages/Search/Index.cshtml
@@ -64,11 +64,11 @@
 				<td>
 					<a asp-page="/Games/Index" asp-route-id="@result.Id">@result.DisplayName</a>
 				</td>
-				<td>@string.Join(",", result.Systems.Distinct())</td>
+				<td>@string.Join(", ", result.Systems.Distinct())</td>
 				<td>
 					@foreach (var group in result.Groups)
 					{
-						<a asp-page="/GameGroups/Index" asp-route-id="@group.Id">@group.Name</a>
+						<span><a asp-page="/GameGroups/Index" asp-route-id="@group.Id">@group.Name</a><span condition="group != result.Groups.Last()">, </span></span>
 					}
 				</td>
 			</tr>
diff --git a/TASVideos/Pages/Search/Index.cshtml.cs b/TASVideos/Pages/Search/Index.cshtml.cs
index 4020f7c8d..936c01668 100644
--- a/TASVideos/Pages/Search/Index.cshtml.cs
+++ b/TASVideos/Pages/Search/Index.cshtml.cs
@@ -70,7 +70,7 @@ public async Task<IActionResult> OnGet()
 					g.Id,
 					g.DisplayName,
 					g.GameVersions.Select(v => v.System!.Code),
-					g.GameGroups.Select(gg => new GameGroupEntry(gg.GameGroupId, gg.GameGroup!.Name))))
+					g.GameGroups.Select(gg => new GameGroupEntry(gg.GameGroupId, gg.GameGroup!.Name)).ToList()))
 				.ToListAsync();
 
 			PublicationResults = await db.Publications
@@ -91,7 +91,7 @@ public async Task<IActionResult> OnGet()
 
 	public record PageSearch(string Highlight, string PageName);
 	public record PostSearch(string Highlight, string TopicName, int PostId);
-	public record GameSearch(int Id, string DisplayName, IEnumerable<string> Systems, IEnumerable<GameGroupEntry> Groups);
+	public record GameSearch(int Id, string DisplayName, IEnumerable<string> Systems, List<GameGroupEntry> Groups);
 	public record GameGroupEntry(int Id, string Name);
 	public record PublicationSearch(int Id, string Title, bool IsObsolete);
 }