diff --git a/DiscImageChef.CommonTypes b/DiscImageChef.CommonTypes
index 374c1455..e95d90a9 160000
--- a/DiscImageChef.CommonTypes
+++ b/DiscImageChef.CommonTypes
@@ -1 +1 @@
-Subproject commit 374c1455625c672373741bc7a830e69eb13d8c3a
+Subproject commit e95d90a9327686e6e84da25f531135abfc0af1c6
diff --git a/DiscImageChef.Server/Areas/Admin/Controllers/MmcController.cs b/DiscImageChef.Server/Areas/Admin/Controllers/MmcController.cs
index b49ba5c4..6a10e7f8 100644
--- a/DiscImageChef.Server/Areas/Admin/Controllers/MmcController.cs
+++ b/DiscImageChef.Server/Areas/Admin/Controllers/MmcController.cs
@@ -16,7 +16,18 @@ namespace DiscImageChef.Server.Areas.Admin.Controllers
         public MmcController(DicServerContext context) => _context = context;
 
         // GET: Admin/Mmc
-        public async Task<IActionResult> Index() => View(await _context.Mmc.ToListAsync());
+        public IActionResult Index() => View(_context.Mmc.Where(m => m.ModeSense2AData != null).
+                                                      Select(m => new MmcModelForView
+                                                      {
+                                                          Id         = m.Id, FeaturesId = m.FeaturesId,
+                                                          DataLength = m.ModeSense2AData.Length
+                                                      }).ToList().
+                                                      Concat(_context.Mmc.Where(m => m.ModeSense2AData == null).
+                                                                      Select(m => new MmcModelForView
+                                                                      {
+                                                                          Id         = m.Id, FeaturesId = m.FeaturesId,
+                                                                          DataLength = 0
+                                                                      }).ToList()).OrderBy(m => m.Id));
 
         // GET: Admin/Mmc/Details/5
         public async Task<IActionResult> Details(int? id)
diff --git a/DiscImageChef.Server/Areas/Admin/Views/Mmc/Index.cshtml b/DiscImageChef.Server/Areas/Admin/Views/Mmc/Index.cshtml
index ebb603c2..cf9086f9 100644
--- a/DiscImageChef.Server/Areas/Admin/Views/Mmc/Index.cshtml
+++ b/DiscImageChef.Server/Areas/Admin/Views/Mmc/Index.cshtml
@@ -1,4 +1,4 @@
-@model IEnumerable<DiscImageChef.CommonTypes.Metadata.Mmc>
+@model IEnumerable<MmcModelForView>
 
 @{
     Layout = "~/Areas/Admin/Views/Shared/_Layout.cshtml";
@@ -37,7 +37,13 @@
     <thead>
     <tr>
         <th>
-            @Html.DisplayNameFor(model => model.ModeSense2AData)
+            @Html.DisplayNameFor(model => model.Id)
+        </th>
+        <th>
+            @Html.DisplayNameFor(model => model.FeaturesId)
+        </th>
+        <th>
+            @Html.DisplayNameFor(model => model.DataLength)
         </th>
         <th></th>
     </tr>
@@ -47,7 +53,20 @@
     {
         <tr>
             <td>
-                @Html.DisplayFor(modelItem => item.ModeSense2AData)
+                @Html.DisplayFor(modelItem => item.Id)
+            </td>
+            <td>
+                @if (item.FeaturesId != null)
+                {
+                    <a asp-action="details" asp-controller="MmcFeatures" asp-route-id="@item.FeaturesId" target="_blank">@Html.DisplayFor(modelItem => item.FeaturesId)</a>
+                }
+                else
+                {
+                    @Html.DisplayFor(modelItem => item.FeaturesId)
+                }
+            </td>
+            <td>
+                @Html.DisplayFor(modelItem => item.DataLength)
             </td>
             <td>
                 <a asp-action="Details" asp-route-id="@item.Id" class="btn btn-primary">Details</a>
diff --git a/DiscImageChef.Server/Models/MmcModelForView.cs b/DiscImageChef.Server/Models/MmcModelForView.cs
new file mode 100644
index 00000000..d8d6dcd4
--- /dev/null
+++ b/DiscImageChef.Server/Models/MmcModelForView.cs
@@ -0,0 +1,14 @@
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+
+namespace DiscImageChef.Server.Models
+{
+    public class MmcModelForView
+    {
+        public int Id { get; set; }
+        [DisplayFormat(NullDisplayText = "none"), DisplayName("MMC FEATURES ID")]
+        public int? FeaturesId { get; set; }
+        [DisplayName("Response length (bytes)")]
+        public int DataLength { get; set; }
+    }
+}
\ No newline at end of file