diff --git a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
index a60b046212..2a24c800b5 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
@@ -9,7 +9,7 @@ using Umbraco.Core.Migrations.Upgrade.V_8_1_0;
 using Umbraco.Core.Migrations.Upgrade.V_8_6_0;
 using Umbraco.Core.Migrations.Upgrade.V_8_9_0;
 using Umbraco.Core.Migrations.Upgrade.V_8_10_0;
-using Umbraco.Core.Migrations.Upgrade.V_8_11_0;
+using Umbraco.Core.Migrations.Upgrade.V_8_12_0;
 
 namespace Umbraco.Core.Migrations.Upgrade
 {
@@ -203,7 +203,7 @@ namespace Umbraco.Core.Migrations.Upgrade
             // to 8.10.0
             To<AddPropertyTypeLabelOnTopColumn>("{D6A8D863-38EC-44FB-91EC-ACD6A668BD18}");
 
-            // to 8.11.0...
+            // to 8.12.0...
             To<AddCmsContentNuByteColumn>("{8DDDCD0B-D7D5-4C97-BD6A-6B38CA65752F}");
             To<UpgradedIncludeIndexes>("{4695D0C9-0729-4976-985B-048D503665D8}");
 
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_11_0/AddCmsContentNuByteColumn.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_12_0/AddCmsContentNuByteColumn.cs
similarity index 90%
rename from src/Umbraco.Core/Migrations/Upgrade/V_8_11_0/AddCmsContentNuByteColumn.cs
rename to src/Umbraco.Core/Migrations/Upgrade/V_8_12_0/AddCmsContentNuByteColumn.cs
index dfde1f0577..7c793688ec 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_11_0/AddCmsContentNuByteColumn.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_12_0/AddCmsContentNuByteColumn.cs
@@ -1,7 +1,7 @@
 using System.Linq;
 using Umbraco.Core.Persistence.Dtos;
 
-namespace Umbraco.Core.Migrations.Upgrade.V_8_11_0
+namespace Umbraco.Core.Migrations.Upgrade.V_8_12_0
 {
     public class AddCmsContentNuByteColumn : MigrationBase
     {
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_11_0/UpgradedIncludeIndexes.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_12_0/UpgradedIncludeIndexes.cs
similarity index 98%
rename from src/Umbraco.Core/Migrations/Upgrade/V_8_11_0/UpgradedIncludeIndexes.cs
rename to src/Umbraco.Core/Migrations/Upgrade/V_8_12_0/UpgradedIncludeIndexes.cs
index 6919558fc3..d88abdef75 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_11_0/UpgradedIncludeIndexes.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_12_0/UpgradedIncludeIndexes.cs
@@ -3,7 +3,7 @@ using Umbraco.Core.Migrations.Expressions.Execute.Expressions;
 using Umbraco.Core.Persistence.DatabaseModelDefinitions;
 using Umbraco.Core.Persistence.Dtos;
 
-namespace Umbraco.Core.Migrations.Upgrade.V_8_11_0
+namespace Umbraco.Core.Migrations.Upgrade.V_8_12_0
 {
     public class UpgradedIncludeIndexes : MigrationBase
     {
diff --git a/src/Umbraco.Core/Persistence/Dtos/NodeDto.cs b/src/Umbraco.Core/Persistence/Dtos/NodeDto.cs
index 62475af833..207195e594 100644
--- a/src/Umbraco.Core/Persistence/Dtos/NodeDto.cs
+++ b/src/Umbraco.Core/Persistence/Dtos/NodeDto.cs
@@ -58,7 +58,7 @@ namespace Umbraco.Core.Persistence.Dtos
 
         [Column("nodeObjectType")] // TODO: db rename to 'objectType'
         [NullSetting(NullSetting = NullSettings.Null)]        
-        [Index(IndexTypes.NonClustered, Name = "IX_" + TableName + "_ObjectType", IncludeColumns = "parentId,level,path,sortOrder,trashed,nodeUser,text,createDate")]        
+        [Index(IndexTypes.NonClustered, Name = "IX_" + TableName + "_ObjectType", ForColumns = "nodeObjectType,trashed", IncludeColumns = "uniqueId,parentId,level,path,sortOrder,nodeUser,text,createDate")]
         public Guid? NodeObjectType { get; set; }
 
         [Column("createDate")]
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index eaf13eb955..6c473235a7 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -133,8 +133,8 @@
     <Compile Include="Migrations\Upgrade\V_8_0_0\Models\ContentTypeDto80.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\Models\PropertyDataDto80.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\Models\PropertyTypeDto80.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_11_0\AddCmsContentNuByteColumn.cs" />
-    <Compile Include="Migrations\Upgrade\V_8_11_0\UpgradedIncludeIndexes.cs" />
+    <Compile Include="Migrations\Upgrade\V_8_12_0\AddCmsContentNuByteColumn.cs" />
+    <Compile Include="Migrations\Upgrade\V_8_12_0\UpgradedIncludeIndexes.cs" />
     <Compile Include="Migrations\Upgrade\V_8_10_0\AddPropertyTypeLabelOnTopColumn.cs" />
     <Compile Include="Migrations\Upgrade\V_8_9_0\ExternalLoginTableUserData.cs" />
     <Compile Include="Models\Blocks\BlockEditorDataConverter.cs" />