Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql
===================================================================
diff -u -rfd0843e0cb20553ec217aa061530ff48b3aad2c8 -rd9567ad9a530beced57fa695be79dbfba404d5fd
--- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql	(.../Migration_17.3_18.1.sql)	(revision fd0843e0cb20553ec217aa061530ff48b3aad2c8)
+++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql	(.../Migration_17.3_18.1.sql)	(revision d9567ad9a530beced57fa695be79dbfba404d5fd)
@@ -1070,15 +1070,24 @@
 		SELECT
 			HydraulicLocationCalculationEntityId
 		FROM GrassCoverErosionOutwardsFailureMechanismMetaEntity gceofmme
-		JOIN FailureMechanismEntity USING(FailureMechanismEntityId)
+		JOIN FailureMechanismEntity fm USING(FailureMechanismEntityId)
 		JOIN AssessmentSectionEntity USING(AssessmentSectionEntityId)
 		JOIN HydraulicLocationCalculationCollectionEntity hlcce 
 		ON gceofmme.HydraulicLocationCalculationCollectionEntity2Id = hlcce.HydraulicLocationCalculationCollectionEntityId
 		OR gceofmme.HydraulicLocationCalculationCollectionEntity3Id = hlcce.HydraulicLocationCalculationCollectionEntityId 
 		OR gceofmme.HydraulicLocationCalculationCollectionEntity5Id = hlcce.HydraulicLocationCalculationCollectionEntityId 
 		OR gceofmme.HydraulicLocationCalculationCollectionEntity6Id = hlcce.HydraulicLocationCalculationCollectionEntityId
 		JOIN HydraulicLocationCalculationEntity USING(HydraulicLocationCalculationCollectionEntityId)
-		JOIN [SOURCEPROJECT].GrassCoverErosionOutwardsHydraulicLocationEntity ON GrassCoverErosionOutwardsHydraulicLocationEntityId = HydraulicLocationEntityId
+		JOIN HydraulicLocationEntity hl USING(HydraulicLocationEntityId)
+		JOIN (
+				SELECT 
+					LocationId,
+					AssessmentSectionEntityId,
+					ShouldDesignWaterLevelIllustrationPointsBeCalculated,
+					ShouldWaveHeightIllustrationPointsBeCalculated
+				FROM [SOURCEPROJECT].GrassCoverErosionOutwardsHydraulicLocationEntity
+				JOIN [SOURCEPROJECT].FailureMechanismEntity USING(FailureMechanismEntityId)
+		) SOURCE ON (SOURCE.LocationId = hl.LocationId AND SOURCE.AssessmentSectionEntityId = fm.AssessmentSectionEntityId)
 		WHERE (ShouldDesignWaterLevelIllustrationPointsBeCalculated = 1 AND NormativeNormType = 2 AND gceofmme.HydraulicLocationCalculationCollectionEntity2Id = hlcce.HydraulicLocationCalculationCollectionEntityId)
 		OR (ShouldDesignWaterLevelIllustrationPointsBeCalculated = 1 AND NormativeNormType = 1 AND gceofmme.HydraulicLocationCalculationCollectionEntity3Id = hlcce.HydraulicLocationCalculationCollectionEntityId)
 		OR (ShouldWaveHeightIllustrationPointsBeCalculated = 1 AND NormativeNormType = 2 AND gceofmme.HydraulicLocationCalculationCollectionEntity5Id = hlcce.HydraulicLocationCalculationCollectionEntityId)
Index: Application/Ringtoets/test/Application.Ringtoets.Migration.Core.Test/test-data/FullTestProject173.rtd
===================================================================
diff -u -r61808c72b843d8c2be0ad3e4a8d7a7fdcb4fedbf -rd9567ad9a530beced57fa695be79dbfba404d5fd
Binary files differ
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo181IntegrationTest.cs
===================================================================
diff -u -rfd0843e0cb20553ec217aa061530ff48b3aad2c8 -rd9567ad9a530beced57fa695be79dbfba404d5fd
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo181IntegrationTest.cs	(.../MigrationTo181IntegrationTest.cs)	(revision fd0843e0cb20553ec217aa061530ff48b3aad2c8)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo181IntegrationTest.cs	(.../MigrationTo181IntegrationTest.cs)	(revision d9567ad9a530beced57fa695be79dbfba404d5fd)
@@ -1629,9 +1629,17 @@
                        "JOIN HydraulicLocationCalculationCollectionEntity hlcce " +
                        $"ON gceofmme.HydraulicLocationCalculationCollectionEntity{(int) calculationType}Id = hlcce.HydraulicLocationCalculationCollectionEntityId  " +
                        "JOIN HydraulicLocationCalculationEntity NEW USING(HydraulicLocationCalculationCollectionEntityId)  " +
-                       "JOIN [SOURCEPROJECT].GrassCoverErosionOutwardsHydraulicLocationEntity OLD ON OLD.GrassCoverErosionOutwardsHydraulicLocationEntityId = NEW.HydraulicLocationEntityId  " +
-                       "JOIN FailureMechanismEntity USING(FailureMechanismEntityId) " +
+                       "JOIN HydraulicLocationEntity hl USING(HydraulicLocationEntityId) " +
+                       "JOIN FailureMechanismEntity fm USING(FailureMechanismEntityId) " +
                        "JOIN AssessmentSectionEntity ase USING(AssessmentSectionEntityId) " +
+                       "JOIN( " +
+                       "SELECT " +
+                       "LocationId, " +
+                       "AssessmentSectionEntityId, " +
+                       "ShouldDesignWaterLevelIllustrationPointsBeCalculated " +
+                       "FROM[SOURCEPROJECT].GrassCoverErosionOutwardsHydraulicLocationEntity " +
+                       "JOIN[SOURCEPROJECT].FailureMechanismEntity USING(FailureMechanismEntityId) " +
+                       ") OLD ON(OLD.LocationId = hl.LocationId AND OLD.AssessmentSectionEntityId = fm.AssessmentSectionEntityId) " +
                        $"WHERE OLD.ShouldDesignWaterLevelIllustrationPointsBeCalculated != NEW.ShouldIllustrationPointsBeCalculated AND ase.NormativeNormType = {(int) normType}; " +
                        "DETACH DATABASE SOURCEPROJECT;";
             }
@@ -1686,9 +1694,17 @@
                        "JOIN HydraulicLocationCalculationCollectionEntity hlcce " +
                        $"ON gceofmme.HydraulicLocationCalculationCollectionEntity{(int) calculationType}Id = hlcce.HydraulicLocationCalculationCollectionEntityId  " +
                        "JOIN HydraulicLocationCalculationEntity NEW USING(HydraulicLocationCalculationCollectionEntityId)  " +
-                       "JOIN [SOURCEPROJECT].GrassCoverErosionOutwardsHydraulicLocationEntity OLD ON OLD.GrassCoverErosionOutwardsHydraulicLocationEntityId = NEW.HydraulicLocationEntityId  " +
-                       "JOIN FailureMechanismEntity USING(FailureMechanismEntityId) " +
+                       "JOIN HydraulicLocationEntity hl USING(HydraulicLocationEntityId) " +
+                       "JOIN FailureMechanismEntity fm USING(FailureMechanismEntityId) " +
                        "JOIN AssessmentSectionEntity ase USING(AssessmentSectionEntityId) " +
+                       "JOIN( " +
+                       "SELECT " +
+                       "LocationId, " +
+                       "AssessmentSectionEntityId, " +
+                       "ShouldWaveHeightIllustrationPointsBeCalculated " +
+                       "FROM[SOURCEPROJECT].GrassCoverErosionOutwardsHydraulicLocationEntity " +
+                       "JOIN[SOURCEPROJECT].FailureMechanismEntity USING(FailureMechanismEntityId) " +
+                       ") OLD ON(OLD.LocationId = hl.LocationId AND OLD.AssessmentSectionEntityId = fm.AssessmentSectionEntityId) " +
                        $"WHERE OLD.ShouldWaveHeightIllustrationPointsBeCalculated != NEW.ShouldIllustrationPointsBeCalculated AND ase.NormativeNormType = {(int) normType}; " +
                        "DETACH DATABASE SOURCEPROJECT;";
             }