Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Builders/SoilDatabaseQueryBuilder.cs
===================================================================
diff -u -rbf334f50530164badedba45a78f3aab857ae1bf6 -r7fae71414e3c8eb1a72de4c173850498104205bd
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/Builders/SoilDatabaseQueryBuilder.cs	(.../SoilDatabaseQueryBuilder.cs)	(revision bf334f50530164badedba45a78f3aab857ae1bf6)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Builders/SoilDatabaseQueryBuilder.cs	(.../SoilDatabaseQueryBuilder.cs)	(revision 7fae71414e3c8eb1a72de4c173850498104205bd)
@@ -127,7 +127,7 @@
                 "JOIN Segment AS segment USING(ME_ID) " +
                 "JOIN StochasticSoilProfile ssp USING(SSM_ID) " +
                 "JOIN SoilLayer2D sl2D USING(SP2D_ID) " +
-                "JOIN MechanismPointLocation mpl USING(ME_ID) " +
+                "JOIN MechanismPointLocation mpl USING(ME_ID, SP2D_ID) " +
                 "WHERE m.ME_Name = @{0}" +
                 ") " +
                 "AS {1};",
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilDatabaseQueryBuilderTest.cs
===================================================================
diff -u -rbf334f50530164badedba45a78f3aab857ae1bf6 -r7fae71414e3c8eb1a72de4c173850498104205bd
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilDatabaseQueryBuilderTest.cs	(.../SoilDatabaseQueryBuilderTest.cs)	(revision bf334f50530164badedba45a78f3aab857ae1bf6)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilDatabaseQueryBuilderTest.cs	(.../SoilDatabaseQueryBuilderTest.cs)	(revision 7fae71414e3c8eb1a72de4c173850498104205bd)
@@ -77,7 +77,7 @@
                                          "JOIN Segment AS segment USING(ME_ID) " +
                                          "JOIN StochasticSoilProfile ssp USING(SSM_ID) " +
                                          "JOIN SoilLayer2D sl2D USING(SP2D_ID) " +
-                                         "JOIN MechanismPointLocation mpl USING(ME_ID) " +
+                                         "JOIN MechanismPointLocation mpl USING(ME_ID, SP2D_ID) " +
                                          "WHERE m.ME_Name = @ME_Name" +
                                          ") AS nrOfRows;";
 
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/PipingSoilProfileReaderTest.cs
===================================================================
diff -u -r49f905d3363336d44ef828259692644dcf5f9edc -r7fae71414e3c8eb1a72de4c173850498104205bd
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/PipingSoilProfileReaderTest.cs	(.../PipingSoilProfileReaderTest.cs)	(revision 49f905d3363336d44ef828259692644dcf5f9edc)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/PipingSoilProfileReaderTest.cs	(.../PipingSoilProfileReaderTest.cs)	(revision 7fae71414e3c8eb1a72de4c173850498104205bd)
@@ -584,10 +584,12 @@
 
                 // Assert
                 Assert.AreEqual(0, skipped);
-                Assert.AreEqual(24, pipingSoilProfilesReader.Count);
-                Assert.AreEqual(24, result.Count);
+                Assert.AreEqual(26, pipingSoilProfilesReader.Count);
+                Assert.AreEqual(26, result.Count);
                 CollectionAssert.AreEqual(new[]
                 {
+                    "AD640M00_Segment_36005_1D1",
+                    "AD640M00_Segment_36005_1D2",
                     "Segment_36005_1D1",
                     "Segment_36005_1D2",
                     "Segment_36005_1D3",
@@ -632,6 +634,8 @@
                     -45,
                     -45,
                     -45,
+                    -45,
+                    -45,
                     -52,
                     -52,
                     -52,
@@ -644,6 +648,8 @@
 
                 CollectionAssert.AreEqual(new[]
                 {
+                    9,
+                    7,
                     8,
                     6,
                     6,
@@ -687,13 +693,16 @@
                 CollectionAssert.AllItemsAreUnique(layerTops);
                 CollectionAssert.AreEqual(expectedFirstProfileLayersTops, layerTops, new DoubleWithToleranceComparer(1e-6));
 
-                var secondProfile = result.FirstOrDefault(l => l.Name == "Segment_36005_1D2");
+                var secondProfile = result.FirstOrDefault(l => l.Name == "AD640M00_Segment_36005_1D1");
                 Assert.NotNull(secondProfile);
                 var expectedSecondProfileLayersTops = new[]
                 {
+                    5.9075,
                     3.25,
-                    -0.5,
-                    -0.75,
+                    2.75,
+                    1.25,
+                    1,
+                    -2.5,
                     -13,
                     -17,
                     -25,
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingSoilProfilesReader/complete.soil
===================================================================
diff -u -r14db78eb3fc065c42f2d92c60d9d6b4b43dc9bd7 -r7fae71414e3c8eb1a72de4c173850498104205bd
Binary files differ
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSoilProfilesImporterTest.cs
===================================================================
diff -u -rb53320286e086524c6003dc6e47af798ee3935be -r7fae71414e3c8eb1a72de4c173850498104205bd
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSoilProfilesImporterTest.cs	(.../PipingSoilProfilesImporterTest.cs)	(revision b53320286e086524c6003dc6e47af798ee3935be)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSoilProfilesImporterTest.cs	(.../PipingSoilProfilesImporterTest.cs)	(revision 7fae71414e3c8eb1a72de4c173850498104205bd)
@@ -246,7 +246,7 @@
 
             // Assert
             Assert.IsTrue(importResult);
-            var expectedProfiles = 24;
+            var expectedProfiles = 26;
             var expectedModels = 3;
 
             var expectedProgressMessages = new List<ProgressNotification>
@@ -313,7 +313,7 @@
             TestHelper.AssertLogMessagesAreGenerated(call, expectedLogMessages, expectedLogMessages.Length);
 
             Assert.IsTrue(importResult);
-            Assert.AreEqual(33*2, progress);
+            Assert.AreEqual(35*2, progress);
 
             mockRepository.VerifyAll();
         }
@@ -394,7 +394,7 @@
 
             // Assert
             Assert.IsTrue(importResult);
-            Assert.AreEqual(34, progress);
+            Assert.AreEqual(36, progress);
         }
 
         [Test]