diff --git a/mtest/capella/io/test8.cap-ref.mscx b/mtest/capella/io/test8.cap-ref.mscx
index ca919d2c35..63dd9396a2 100644
--- a/mtest/capella/io/test8.cap-ref.mscx
+++ b/mtest/capella/io/test8.cap-ref.mscx
@@ -84,30 +84,30 @@
           </Slur>
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="start" id="2"/>
           <Note>
             <pitch>48</pitch>
             <tpc>14</tpc>
             </Note>
-          <Slur type="start" id="2"/>
           </Chord>
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="stop" id="2"/>
           <Note>
             <pitch>50</pitch>
             <tpc>16</tpc>
             </Note>
-          <Slur type="stop" id="2"/>
           </Chord>
         <Slur id="3">
           <track>0</track>
           </Slur>
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="start" id="3"/>
           <Note>
             <pitch>52</pitch>
             <tpc>18</tpc>
             </Note>
-          <Slur type="start" id="3"/>
           </Chord>
         <Chord>
           <durationType>quarter</durationType>
@@ -120,22 +120,22 @@
       <Measure number="2">
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="stop" id="3"/>
           <Note>
             <pitch>55</pitch>
             <tpc>15</tpc>
             </Note>
-          <Slur type="stop" id="3"/>
           </Chord>
         <Slur id="4">
           <track>0</track>
           </Slur>
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="start" id="4"/>
           <Note>
             <pitch>57</pitch>
             <tpc>17</tpc>
             </Note>
-          <Slur type="start" id="4"/>
           </Chord>
         <Chord>
           <durationType>quarter</durationType>
@@ -159,11 +159,11 @@
           </LayoutBreak>
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="stop" id="4"/>
           <Note>
             <pitch>62</pitch>
             <tpc>16</tpc>
             </Note>
-          <Slur type="stop" id="4"/>
           </Chord>
         <Chord>
           <durationType>quarter</durationType>
diff --git a/mtest/capella/io/testSlurTie.capx-ref.mscx b/mtest/capella/io/testSlurTie.capx-ref.mscx
index 843c2b6f53..e0bfbed5a5 100644
--- a/mtest/capella/io/testSlurTie.capx-ref.mscx
+++ b/mtest/capella/io/testSlurTie.capx-ref.mscx
@@ -86,11 +86,11 @@
           </Slur>
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="start" id="2"/>
           <Note>
             <pitch>60</pitch>
             <tpc>14</tpc>
             </Note>
-          <Slur type="start" id="2"/>
           </Chord>
         <Chord>
           <durationType>quarter</durationType>
@@ -111,11 +111,11 @@
           </Chord>
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="stop" id="2"/>
           <Note>
             <pitch>64</pitch>
             <tpc>18</tpc>
             </Note>
-          <Slur type="stop" id="2"/>
           </Chord>
         </Measure>
       </Staff>
diff --git a/mtest/guitarpro/legato-slide.gp4-ref.mscx b/mtest/guitarpro/legato-slide.gp4-ref.mscx
index 4e11eced70..8f86323e8b 100644
--- a/mtest/guitarpro/legato-slide.gp4-ref.mscx
+++ b/mtest/guitarpro/legato-slide.gp4-ref.mscx
@@ -128,6 +128,7 @@
         <Chord>
           <lid>10</lid>
           <durationType>quarter</durationType>
+          <Slur type="start" id="2"/>
           <Note>
             <lid>11</lid>
             <pitch>57</pitch>
@@ -135,7 +136,6 @@
             <fret>7</fret>
             <string>3</string>
             </Note>
-          <Slur type="start" id="2"/>
           </Chord>
         <Dynamic>
           <subtype>mp</subtype>
@@ -145,6 +145,7 @@
         <Chord>
           <lid>13</lid>
           <durationType>quarter</durationType>
+          <Slur type="stop" id="2"/>
           <Note>
             <lid>14</lid>
             <pitch>59</pitch>
@@ -156,7 +157,6 @@
             <subtype>0</subtype>
             <lid>15</lid>
             </Glissando>
-          <Slur type="stop" id="2"/>
           </Chord>
         <Rest>
           <lid>16</lid>
@@ -317,6 +317,7 @@
           <Chord>
             <lid>10</lid>
             <durationType>quarter</durationType>
+            <Slur type="start" id="3"/>
             <Note>
               <lid>11</lid>
               <pitch>57</pitch>
@@ -324,7 +325,6 @@
               <fret>7</fret>
               <string>3</string>
               </Note>
-            <Slur type="start" id="3"/>
             </Chord>
           <Dynamic>
             <subtype>mp</subtype>
@@ -334,6 +334,7 @@
           <Chord>
             <lid>13</lid>
             <durationType>quarter</durationType>
+            <Slur type="stop" id="3"/>
             <Note>
               <lid>14</lid>
               <pitch>59</pitch>
@@ -345,7 +346,6 @@
               <subtype>0</subtype>
               <lid>15</lid>
               </Glissando>
-            <Slur type="stop" id="3"/>
             </Chord>
           <Rest>
             <lid>16</lid>
@@ -374,6 +374,7 @@
           <Chord>
             <lid>10</lid>
             <durationType>quarter</durationType>
+            <Slur type="start" id="4"/>
             <Note>
               <lid>11</lid>
               <pitch>57</pitch>
@@ -381,11 +382,11 @@
               <fret>7</fret>
               <string>3</string>
               </Note>
-            <Slur type="start" id="4"/>
             </Chord>
           <Chord>
             <lid>13</lid>
             <durationType>quarter</durationType>
+            <Slur type="stop" id="4"/>
             <Note>
               <lid>14</lid>
               <pitch>59</pitch>
@@ -397,7 +398,6 @@
               <subtype>0</subtype>
               <lid>15</lid>
               </Glissando>
-            <Slur type="stop" id="4"/>
             </Chord>
           <Rest>
             <lid>16</lid>
diff --git a/mtest/guitarpro/legato-slide.gp5-ref.mscx b/mtest/guitarpro/legato-slide.gp5-ref.mscx
index 0827e929e4..0aefca14b1 100644
--- a/mtest/guitarpro/legato-slide.gp5-ref.mscx
+++ b/mtest/guitarpro/legato-slide.gp5-ref.mscx
@@ -108,6 +108,7 @@
         <Chord>
           <lid>6</lid>
           <durationType>quarter</durationType>
+          <Slur type="start" id="2"/>
           <Note>
             <lid>7</lid>
             <pitch>57</pitch>
@@ -115,7 +116,6 @@
             <fret>7</fret>
             <string>3</string>
             </Note>
-          <Slur type="start" id="2"/>
           </Chord>
         <Dynamic>
           <subtype>mp</subtype>
@@ -125,6 +125,7 @@
         <Chord>
           <lid>9</lid>
           <durationType>quarter</durationType>
+          <Slur type="stop" id="2"/>
           <Note>
             <lid>10</lid>
             <pitch>59</pitch>
@@ -136,7 +137,6 @@
             <subtype>0</subtype>
             <lid>11</lid>
             </Glissando>
-          <Slur type="stop" id="2"/>
           </Chord>
         <Rest>
           <lid>12</lid>
@@ -298,6 +298,7 @@
           <Chord>
             <lid>6</lid>
             <durationType>quarter</durationType>
+            <Slur type="start" id="3"/>
             <Note>
               <lid>7</lid>
               <pitch>57</pitch>
@@ -305,7 +306,6 @@
               <fret>7</fret>
               <string>3</string>
               </Note>
-            <Slur type="start" id="3"/>
             </Chord>
           <Dynamic>
             <subtype>mp</subtype>
@@ -315,6 +315,7 @@
           <Chord>
             <lid>9</lid>
             <durationType>quarter</durationType>
+            <Slur type="stop" id="3"/>
             <Note>
               <lid>10</lid>
               <pitch>59</pitch>
@@ -326,7 +327,6 @@
               <subtype>0</subtype>
               <lid>11</lid>
               </Glissando>
-            <Slur type="stop" id="3"/>
             </Chord>
           <Rest>
             <lid>12</lid>
@@ -376,6 +376,7 @@
           <Chord>
             <lid>6</lid>
             <durationType>quarter</durationType>
+            <Slur type="start" id="4"/>
             <Note>
               <lid>7</lid>
               <pitch>57</pitch>
@@ -383,11 +384,11 @@
               <fret>7</fret>
               <string>3</string>
               </Note>
-            <Slur type="start" id="4"/>
             </Chord>
           <Chord>
             <lid>9</lid>
             <durationType>quarter</durationType>
+            <Slur type="stop" id="4"/>
             <Note>
               <lid>10</lid>
               <pitch>59</pitch>
@@ -399,7 +400,6 @@
               <subtype>0</subtype>
               <lid>11</lid>
               </Glissando>
-            <Slur type="stop" id="4"/>
             </Chord>
           <Rest>
             <lid>12</lid>
diff --git a/mtest/guitarpro/legato-slide.gpx-ref.mscx b/mtest/guitarpro/legato-slide.gpx-ref.mscx
index 170f9157ee..9d47e2ab4a 100644
--- a/mtest/guitarpro/legato-slide.gpx-ref.mscx
+++ b/mtest/guitarpro/legato-slide.gpx-ref.mscx
@@ -145,6 +145,7 @@
         <Chord>
           <lid>7</lid>
           <durationType>quarter</durationType>
+          <Slur type="start" id="2"/>
           <Note>
             <lid>8</lid>
             <pitch>57</pitch>
@@ -152,7 +153,6 @@
             <fret>7</fret>
             <string>3</string>
             </Note>
-          <Slur type="start" id="2"/>
           </Chord>
         <Dynamic>
           <subtype>mp</subtype>
@@ -162,6 +162,7 @@
         <Chord>
           <lid>10</lid>
           <durationType>quarter</durationType>
+          <Slur type="stop" id="2"/>
           <Note>
             <lid>11</lid>
             <pitch>59</pitch>
@@ -173,7 +174,6 @@
             <subtype>0</subtype>
             <lid>12</lid>
             </Glissando>
-          <Slur type="stop" id="2"/>
           </Chord>
         <Rest>
           <lid>13</lid>
@@ -351,6 +351,7 @@
           <Chord>
             <lid>7</lid>
             <durationType>quarter</durationType>
+            <Slur type="start" id="3"/>
             <Note>
               <lid>8</lid>
               <pitch>57</pitch>
@@ -358,7 +359,6 @@
               <fret>7</fret>
               <string>3</string>
               </Note>
-            <Slur type="start" id="3"/>
             </Chord>
           <Dynamic>
             <subtype>mp</subtype>
@@ -368,6 +368,7 @@
           <Chord>
             <lid>10</lid>
             <durationType>quarter</durationType>
+            <Slur type="stop" id="3"/>
             <Note>
               <lid>11</lid>
               <pitch>59</pitch>
@@ -379,7 +380,6 @@
               <subtype>0</subtype>
               <lid>12</lid>
               </Glissando>
-            <Slur type="stop" id="3"/>
             </Chord>
           <Rest>
             <lid>13</lid>
@@ -408,6 +408,7 @@
           <Chord>
             <lid>7</lid>
             <durationType>quarter</durationType>
+            <Slur type="start" id="4"/>
             <Note>
               <lid>8</lid>
               <pitch>57</pitch>
@@ -415,11 +416,11 @@
               <fret>7</fret>
               <string>3</string>
               </Note>
-            <Slur type="start" id="4"/>
             </Chord>
           <Chord>
             <lid>10</lid>
             <durationType>quarter</durationType>
+            <Slur type="stop" id="4"/>
             <Note>
               <lid>11</lid>
               <pitch>59</pitch>
@@ -431,7 +432,6 @@
               <subtype>0</subtype>
               <lid>12</lid>
               </Glissando>
-            <Slur type="stop" id="4"/>
             </Chord>
           <Rest>
             <lid>13</lid>
diff --git a/mtest/guitarpro/slur-notes-effect-mask.gp5-ref.mscx b/mtest/guitarpro/slur-notes-effect-mask.gp5-ref.mscx
index 6ad1491a42..1b82f8b6c9 100644
--- a/mtest/guitarpro/slur-notes-effect-mask.gp5-ref.mscx
+++ b/mtest/guitarpro/slur-notes-effect-mask.gp5-ref.mscx
@@ -106,6 +106,7 @@
           <lid>5</lid>
           <durationType>16th</durationType>
           <Beam>1</Beam>
+          <Slur type="start" id="2"/>
           <Note>
             <lid>6</lid>
             <pitch>55</pitch>
@@ -113,7 +114,6 @@
             <fret>12</fret>
             <string>0</string>
             </Note>
-          <Slur type="start" id="2"/>
           </Chord>
         <Chord>
           <lid>7</lid>
@@ -134,6 +134,7 @@
           <lid>9</lid>
           <durationType>16th</durationType>
           <Beam>1</Beam>
+          <Slur type="stop" id="2"/>
           <Note>
             <lid>10</lid>
             <pitch>52</pitch>
@@ -141,7 +142,6 @@
             <fret>9</fret>
             <string>0</string>
             </Note>
-          <Slur type="stop" id="2"/>
           </Chord>
         <Slur id="3">
           <lid>38</lid>
@@ -155,6 +155,7 @@
           <lid>11</lid>
           <durationType>16th</durationType>
           <Beam>2</Beam>
+          <Slur type="start" id="3"/>
           <Note>
             <lid>12</lid>
             <pitch>47</pitch>
@@ -162,12 +163,12 @@
             <fret>9</fret>
             <string>1</string>
             </Note>
-          <Slur type="start" id="3"/>
           </Chord>
         <Chord>
           <lid>13</lid>
           <durationType>16th</durationType>
           <Beam>2</Beam>
+          <Slur type="stop" id="3"/>
           <Note>
             <lid>14</lid>
             <Accidental>
@@ -178,7 +179,6 @@
             <fret>11</fret>
             <string>1</string>
             </Note>
-          <Slur type="stop" id="3"/>
           </Chord>
         <Chord>
           <lid>15</lid>
@@ -467,6 +467,7 @@
             <lid>5</lid>
             <durationType>16th</durationType>
             <Beam>4</Beam>
+            <Slur type="start" id="4"/>
             <Note>
               <lid>6</lid>
               <pitch>55</pitch>
@@ -474,7 +475,6 @@
               <fret>12</fret>
               <string>0</string>
               </Note>
-            <Slur type="start" id="4"/>
             </Chord>
           <Chord>
             <lid>7</lid>
@@ -495,6 +495,7 @@
             <lid>9</lid>
             <durationType>16th</durationType>
             <Beam>4</Beam>
+            <Slur type="stop" id="4"/>
             <Note>
               <lid>10</lid>
               <pitch>52</pitch>
@@ -502,7 +503,6 @@
               <fret>9</fret>
               <string>0</string>
               </Note>
-            <Slur type="stop" id="4"/>
             </Chord>
           <Slur id="5">
             <lid>38</lid>
@@ -516,6 +516,7 @@
             <lid>11</lid>
             <durationType>16th</durationType>
             <Beam>5</Beam>
+            <Slur type="start" id="5"/>
             <Note>
               <lid>12</lid>
               <pitch>47</pitch>
@@ -523,12 +524,12 @@
               <fret>9</fret>
               <string>1</string>
               </Note>
-            <Slur type="start" id="5"/>
             </Chord>
           <Chord>
             <lid>13</lid>
             <durationType>16th</durationType>
             <Beam>5</Beam>
+            <Slur type="stop" id="5"/>
             <Note>
               <lid>14</lid>
               <Accidental>
@@ -539,7 +540,6 @@
               <fret>11</fret>
               <string>1</string>
               </Note>
-            <Slur type="stop" id="5"/>
             </Chord>
           <Chord>
             <lid>15</lid>
@@ -723,6 +723,7 @@
             <lid>5</lid>
             <durationType>16th</durationType>
             <Beam>7</Beam>
+            <Slur type="start" id="6"/>
             <Note>
               <lid>6</lid>
               <pitch>55</pitch>
@@ -730,7 +731,6 @@
               <fret>12</fret>
               <string>0</string>
               </Note>
-            <Slur type="start" id="6"/>
             </Chord>
           <Chord>
             <lid>7</lid>
@@ -748,6 +748,7 @@
             <lid>9</lid>
             <durationType>16th</durationType>
             <Beam>7</Beam>
+            <Slur type="stop" id="6"/>
             <Note>
               <lid>10</lid>
               <pitch>52</pitch>
@@ -755,7 +756,6 @@
               <fret>9</fret>
               <string>0</string>
               </Note>
-            <Slur type="stop" id="6"/>
             </Chord>
           <Slur id="7">
             <lid>38</lid>
@@ -769,6 +769,7 @@
             <lid>11</lid>
             <durationType>16th</durationType>
             <Beam>8</Beam>
+            <Slur type="start" id="7"/>
             <Note>
               <lid>12</lid>
               <pitch>47</pitch>
@@ -776,12 +777,12 @@
               <fret>9</fret>
               <string>1</string>
               </Note>
-            <Slur type="start" id="7"/>
             </Chord>
           <Chord>
             <lid>13</lid>
             <durationType>16th</durationType>
             <Beam>8</Beam>
+            <Slur type="stop" id="7"/>
             <Note>
               <lid>14</lid>
               <pitch>49</pitch>
@@ -789,7 +790,6 @@
               <fret>11</fret>
               <string>1</string>
               </Note>
-            <Slur type="stop" id="7"/>
             </Chord>
           <Chord>
             <lid>15</lid>
diff --git a/mtest/guitarpro/slur.gp4-ref.mscx b/mtest/guitarpro/slur.gp4-ref.mscx
index ad136614d2..1a011baf4c 100644
--- a/mtest/guitarpro/slur.gp4-ref.mscx
+++ b/mtest/guitarpro/slur.gp4-ref.mscx
@@ -124,6 +124,7 @@
         <Chord>
           <lid>9</lid>
           <durationType>quarter</durationType>
+          <Slur type="start" id="2"/>
           <Note>
             <lid>10</lid>
             <pitch>62</pitch>
@@ -131,11 +132,11 @@
             <fret>3</fret>
             <string>1</string>
             </Note>
-          <Slur type="start" id="2"/>
           </Chord>
         <Chord>
           <lid>11</lid>
           <durationType>quarter</durationType>
+          <Slur type="stop" id="2"/>
           <Note>
             <lid>12</lid>
             <pitch>59</pitch>
@@ -143,7 +144,6 @@
             <fret>0</fret>
             <string>1</string>
             </Note>
-          <Slur type="stop" id="2"/>
           </Chord>
         <Rest>
           <lid>13</lid>
@@ -304,6 +304,7 @@
           <Chord>
             <lid>9</lid>
             <durationType>quarter</durationType>
+            <Slur type="start" id="3"/>
             <Note>
               <lid>10</lid>
               <pitch>62</pitch>
@@ -311,11 +312,11 @@
               <fret>3</fret>
               <string>1</string>
               </Note>
-            <Slur type="start" id="3"/>
             </Chord>
           <Chord>
             <lid>11</lid>
             <durationType>quarter</durationType>
+            <Slur type="stop" id="3"/>
             <Note>
               <lid>12</lid>
               <pitch>59</pitch>
@@ -323,7 +324,6 @@
               <fret>0</fret>
               <string>1</string>
               </Note>
-            <Slur type="stop" id="3"/>
             </Chord>
           <Rest>
             <lid>13</lid>
@@ -352,6 +352,7 @@
           <Chord>
             <lid>9</lid>
             <durationType>quarter</durationType>
+            <Slur type="start" id="4"/>
             <Note>
               <lid>10</lid>
               <pitch>62</pitch>
@@ -359,11 +360,11 @@
               <fret>3</fret>
               <string>1</string>
               </Note>
-            <Slur type="start" id="4"/>
             </Chord>
           <Chord>
             <lid>11</lid>
             <durationType>quarter</durationType>
+            <Slur type="stop" id="4"/>
             <Note>
               <lid>12</lid>
               <pitch>59</pitch>
@@ -371,7 +372,6 @@
               <fret>0</fret>
               <string>1</string>
               </Note>
-            <Slur type="stop" id="4"/>
             </Chord>
           <Rest>
             <lid>13</lid>
diff --git a/mtest/guitarpro/slur.gpx-ref.mscx b/mtest/guitarpro/slur.gpx-ref.mscx
index fafeffb62d..8905b45d42 100644
--- a/mtest/guitarpro/slur.gpx-ref.mscx
+++ b/mtest/guitarpro/slur.gpx-ref.mscx
@@ -141,6 +141,7 @@
         <Chord>
           <lid>6</lid>
           <durationType>quarter</durationType>
+          <Slur type="start" id="2"/>
           <Note>
             <lid>7</lid>
             <pitch>62</pitch>
@@ -148,7 +149,6 @@
             <fret>3</fret>
             <string>1</string>
             </Note>
-          <Slur type="start" id="2"/>
           </Chord>
         <Chord>
           <lid>8</lid>
@@ -169,6 +169,7 @@
         <Chord>
           <lid>11</lid>
           <durationType>quarter</durationType>
+          <Slur type="stop" id="2"/>
           <Note>
             <lid>12</lid>
             <pitch>60</pitch>
@@ -176,7 +177,6 @@
             <fret>1</fret>
             <string>1</string>
             </Note>
-          <Slur type="stop" id="2"/>
           </Chord>
         <Chord>
           <lid>13</lid>
@@ -357,6 +357,7 @@
           <Chord>
             <lid>6</lid>
             <durationType>quarter</durationType>
+            <Slur type="start" id="3"/>
             <Note>
               <lid>7</lid>
               <pitch>62</pitch>
@@ -364,7 +365,6 @@
               <fret>3</fret>
               <string>1</string>
               </Note>
-            <Slur type="start" id="3"/>
             </Chord>
           <Chord>
             <lid>8</lid>
@@ -385,6 +385,7 @@
           <Chord>
             <lid>11</lid>
             <durationType>quarter</durationType>
+            <Slur type="stop" id="3"/>
             <Note>
               <lid>12</lid>
               <pitch>60</pitch>
@@ -392,7 +393,6 @@
               <fret>1</fret>
               <string>1</string>
               </Note>
-            <Slur type="stop" id="3"/>
             </Chord>
           <Chord>
             <lid>13</lid>
@@ -424,6 +424,7 @@
           <Chord>
             <lid>6</lid>
             <durationType>quarter</durationType>
+            <Slur type="start" id="4"/>
             <Note>
               <lid>7</lid>
               <pitch>62</pitch>
@@ -431,7 +432,6 @@
               <fret>3</fret>
               <string>1</string>
               </Note>
-            <Slur type="start" id="4"/>
             </Chord>
           <Chord>
             <lid>8</lid>
@@ -447,6 +447,7 @@
           <Chord>
             <lid>11</lid>
             <durationType>quarter</durationType>
+            <Slur type="stop" id="4"/>
             <Note>
               <lid>12</lid>
               <pitch>60</pitch>
@@ -454,7 +455,6 @@
               <fret>1</fret>
               <string>1</string>
               </Note>
-            <Slur type="stop" id="4"/>
             </Chord>
           <Chord>
             <lid>13</lid>
diff --git a/mtest/guitarpro/updateReference b/mtest/guitarpro/updateReference
index d195952540..86dfebdc5c 100755
--- a/mtest/guitarpro/updateReference
+++ b/mtest/guitarpro/updateReference
@@ -10,7 +10,7 @@ cp   $MSCORE/heavy-accent.gp5.mscx heavy-accent.gp5-ref.mscx
 cp   $MSCORE/tremolos.gp5.mscx tremolos.gp5-ref.mscx
 cp   $MSCORE/trill.gp4.mscx trill.gp4-ref.mscx
 cp   $MSCORE/dynamic.gp5.mscx dynamic.gp5-ref.mscx
-cp   $MSCORE/arpeggio_up_down.gp4.mscx arpeggio_up_down.gp4-ref.mscx
+#cp   $MSCORE/arpeggio_up_down.gp4.mscx arpeggio_up_down.gp4-ref.mscx
 cp   $MSCORE/ghost_note.gp3.mscx ghost_note.gp3-ref.mscx
 #cp   $MSCORE/grace.gp5.mscx grace.gp5-ref.mscx
 cp   $MSCORE/volta.gp5.mscx volta.gp5-ref.mscx
diff --git a/mtest/libmscore/compat/slurs-ref.mscx b/mtest/libmscore/compat/slurs-ref.mscx
index 0108a61233..bfea4811ad 100644
--- a/mtest/libmscore/compat/slurs-ref.mscx
+++ b/mtest/libmscore/compat/slurs-ref.mscx
@@ -137,19 +137,19 @@
           </Slur>
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="start" id="2"/>
           <Note>
             <pitch>72</pitch>
             <tpc>14</tpc>
             </Note>
-          <Slur type="start" id="2"/>
           </Chord>
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="stop" id="2"/>
           <Note>
             <pitch>72</pitch>
             <tpc>14</tpc>
             </Note>
-          <Slur type="stop" id="2"/>
           </Chord>
         <Chord>
           <durationType>quarter</durationType>
@@ -172,14 +172,7 @@
           </Slur>
         <Chord>
           <durationType>quarter</durationType>
-          <Note>
-            <pitch>72</pitch>
-            <tpc>14</tpc>
-            </Note>
           <Slur type="start" id="3"/>
-          </Chord>
-        <Chord>
-          <durationType>quarter</durationType>
           <Note>
             <pitch>72</pitch>
             <tpc>14</tpc>
@@ -191,7 +184,14 @@
             <pitch>72</pitch>
             <tpc>14</tpc>
             </Note>
+          </Chord>
+        <Chord>
+          <durationType>quarter</durationType>
           <Slur type="stop" id="3"/>
+          <Note>
+            <pitch>72</pitch>
+            <tpc>14</tpc>
+            </Note>
           </Chord>
         <Chord>
           <durationType>quarter</durationType>
@@ -207,14 +207,7 @@
           </Slur>
         <Chord>
           <durationType>quarter</durationType>
-          <Note>
-            <pitch>72</pitch>
-            <tpc>14</tpc>
-            </Note>
           <Slur type="start" id="4"/>
-          </Chord>
-        <Chord>
-          <durationType>quarter</durationType>
           <Note>
             <pitch>72</pitch>
             <tpc>14</tpc>
@@ -233,7 +226,14 @@
             <pitch>72</pitch>
             <tpc>14</tpc>
             </Note>
+          </Chord>
+        <Chord>
+          <durationType>quarter</durationType>
           <Slur type="stop" id="4"/>
+          <Note>
+            <pitch>72</pitch>
+            <tpc>14</tpc>
+            </Note>
           </Chord>
         </Measure>
       <Measure number="4">
@@ -246,11 +246,11 @@
           </Slur>
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="start" id="5"/>
           <Note>
             <pitch>72</pitch>
             <tpc>14</tpc>
             </Note>
-          <Slur type="start" id="5"/>
           </Chord>
         <Chord>
           <durationType>quarter</durationType>
@@ -298,11 +298,11 @@
           </Chord>
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="stop" id="5"/>
           <Note>
             <pitch>72</pitch>
             <tpc>14</tpc>
             </Note>
-          <Slur type="stop" id="5"/>
           </Chord>
         </Measure>
       <Measure number="6">
@@ -312,14 +312,7 @@
           </Slur>
         <Chord>
           <durationType>quarter</durationType>
-          <Note>
-            <pitch>76</pitch>
-            <tpc>18</tpc>
-            </Note>
           <Slur type="start" id="6"/>
-          </Chord>
-        <Chord>
-          <durationType>quarter</durationType>
           <Note>
             <pitch>76</pitch>
             <tpc>18</tpc>
@@ -338,7 +331,14 @@
             <pitch>76</pitch>
             <tpc>18</tpc>
             </Note>
+          </Chord>
+        <Chord>
+          <durationType>quarter</durationType>
           <Slur type="stop" id="7"/>
+          <Note>
+            <pitch>76</pitch>
+            <tpc>18</tpc>
+            </Note>
           </Chord>
         <tick>9600</tick>
         <Chord>
@@ -353,12 +353,12 @@
         <Chord>
           <track>1</track>
           <durationType>quarter</durationType>
+          <Slur type="stop" id="6"/>
           <Note>
             <track>1</track>
             <pitch>65</pitch>
             <tpc>13</tpc>
             </Note>
-          <Slur type="stop" id="6"/>
           </Chord>
         <Slur id="7">
           <track>1</track>
@@ -367,12 +367,12 @@
         <Chord>
           <track>1</track>
           <durationType>quarter</durationType>
+          <Slur type="start" id="7"/>
           <Note>
             <track>1</track>
             <pitch>65</pitch>
             <tpc>13</tpc>
             </Note>
-          <Slur type="start" id="7"/>
           </Chord>
         <Chord>
           <track>1</track>
@@ -390,14 +390,7 @@
           </Slur>
         <Chord>
           <durationType>quarter</durationType>
-          <Note>
-            <pitch>76</pitch>
-            <tpc>18</tpc>
-            </Note>
           <Slur type="start" id="8"/>
-          </Chord>
-        <Chord>
-          <durationType>quarter</durationType>
           <Note>
             <pitch>76</pitch>
             <tpc>18</tpc>
@@ -416,7 +409,14 @@
             <pitch>76</pitch>
             <tpc>18</tpc>
             </Note>
+          </Chord>
+        <Chord>
+          <durationType>quarter</durationType>
           <Slur type="stop" id="8"/>
+          <Note>
+            <pitch>76</pitch>
+            <tpc>18</tpc>
+            </Note>
           </Chord>
         <tick>11520</tick>
         <Slur id="9">
@@ -425,16 +425,7 @@
         <Chord>
           <track>1</track>
           <durationType>quarter</durationType>
-          <Note>
-            <track>1</track>
-            <pitch>65</pitch>
-            <tpc>13</tpc>
-            </Note>
           <Slur type="start" id="9"/>
-          </Chord>
-        <Chord>
-          <track>1</track>
-          <durationType>quarter</durationType>
           <Note>
             <track>1</track>
             <pitch>65</pitch>
@@ -458,7 +449,16 @@
             <pitch>65</pitch>
             <tpc>13</tpc>
             </Note>
+          </Chord>
+        <Chord>
+          <track>1</track>
+          <durationType>quarter</durationType>
           <Slur type="stop" id="9"/>
+          <Note>
+            <track>1</track>
+            <pitch>65</pitch>
+            <tpc>13</tpc>
+            </Note>
           </Chord>
         </Measure>
       <Measure number="8">
@@ -471,38 +471,38 @@
           </Slur>
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="start" id="10"/>
           <Note>
             <pitch>76</pitch>
             <tpc>18</tpc>
             </Note>
-          <Slur type="start" id="10"/>
           </Chord>
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="stop" id="10"/>
           <Note>
             <pitch>76</pitch>
             <tpc>18</tpc>
             </Note>
-          <Slur type="stop" id="10"/>
           </Chord>
         <Slur id="11">
           <track>0</track>
           </Slur>
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="start" id="11"/>
           <Note>
             <pitch>76</pitch>
             <tpc>18</tpc>
             </Note>
-          <Slur type="start" id="11"/>
           </Chord>
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="stop" id="11"/>
           <Note>
             <pitch>76</pitch>
             <tpc>18</tpc>
             </Note>
-          <Slur type="stop" id="11"/>
           </Chord>
         <tick>13440</tick>
         <Slur id="12">
@@ -511,22 +511,22 @@
         <Chord>
           <track>1</track>
           <durationType>quarter</durationType>
+          <Slur type="start" id="12"/>
           <Note>
             <track>1</track>
             <pitch>65</pitch>
             <tpc>13</tpc>
             </Note>
-          <Slur type="start" id="12"/>
           </Chord>
         <Chord>
           <track>1</track>
           <durationType>quarter</durationType>
+          <Slur type="stop" id="12"/>
           <Note>
             <track>1</track>
             <pitch>65</pitch>
             <tpc>13</tpc>
             </Note>
-          <Slur type="stop" id="12"/>
           </Chord>
         <Slur id="13">
           <track>1</track>
@@ -534,22 +534,22 @@
         <Chord>
           <track>1</track>
           <durationType>quarter</durationType>
+          <Slur type="start" id="13"/>
           <Note>
             <track>1</track>
             <pitch>65</pitch>
             <tpc>13</tpc>
             </Note>
-          <Slur type="start" id="13"/>
           </Chord>
         <Chord>
           <track>1</track>
           <durationType>quarter</durationType>
+          <Slur type="stop" id="13"/>
           <Note>
             <track>1</track>
             <pitch>65</pitch>
             <tpc>13</tpc>
             </Note>
-          <Slur type="stop" id="13"/>
           </Chord>
         </Measure>
       <Measure number="9">
@@ -562,11 +562,11 @@
           </Chord>
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="stop" id="14"/>
           <Note>
             <pitch>72</pitch>
             <tpc>14</tpc>
             </Note>
-          <Slur type="stop" id="14"/>
           </Chord>
         <Slur id="15">
           <track>0</track>
@@ -574,11 +574,11 @@
           </Slur>
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="start" id="15"/>
           <Note>
             <pitch>72</pitch>
             <tpc>14</tpc>
             </Note>
-          <Slur type="start" id="15"/>
           </Chord>
         <Chord>
           <durationType>quarter</durationType>
@@ -630,12 +630,12 @@
         <Chord>
           <track>1</track>
           <durationType>quarter</durationType>
+          <Slur type="stop" id="16"/>
           <Note>
             <track>1</track>
             <pitch>65</pitch>
             <tpc>13</tpc>
             </Note>
-          <Slur type="stop" id="16"/>
           </Chord>
         <Slur id="17">
           <track>1</track>
@@ -644,12 +644,12 @@
         <Chord>
           <track>1</track>
           <durationType>quarter</durationType>
+          <Slur type="start" id="17"/>
           <Note>
             <track>1</track>
             <pitch>65</pitch>
             <tpc>13</tpc>
             </Note>
-          <Slur type="start" id="17"/>
           </Chord>
         <Chord>
           <track>1</track>
@@ -747,14 +747,7 @@
           </Slur>
         <Chord>
           <durationType>quarter</durationType>
-          <Note>
-            <pitch>48</pitch>
-            <tpc>14</tpc>
-            </Note>
           <Slur type="start" id="14"/>
-          </Chord>
-        <Chord>
-          <durationType>quarter</durationType>
           <Note>
             <pitch>48</pitch>
             <tpc>14</tpc>
@@ -773,7 +766,14 @@
             <pitch>48</pitch>
             <tpc>14</tpc>
             </Note>
+          </Chord>
+        <Chord>
+          <durationType>quarter</durationType>
           <Slur type="stop" id="15"/>
+          <Note>
+            <pitch>48</pitch>
+            <tpc>14</tpc>
+            </Note>
           </Chord>
         </Measure>
       <Measure number="10">
@@ -783,14 +783,7 @@
           </Slur>
         <Chord>
           <durationType>quarter</durationType>
-          <Note>
-            <pitch>52</pitch>
-            <tpc>18</tpc>
-            </Note>
           <Slur type="start" id="16"/>
-          </Chord>
-        <Chord>
-          <durationType>quarter</durationType>
           <Note>
             <pitch>52</pitch>
             <tpc>18</tpc>
@@ -809,7 +802,14 @@
             <pitch>52</pitch>
             <tpc>18</tpc>
             </Note>
+          </Chord>
+        <Chord>
+          <durationType>quarter</durationType>
           <Slur type="stop" id="17"/>
+          <Note>
+            <pitch>52</pitch>
+            <tpc>18</tpc>
+            </Note>
           </Chord>
         <tick>17280</tick>
         <Chord>
diff --git a/mtest/libmscore/copypaste/copypaste01-ref.mscx b/mtest/libmscore/copypaste/copypaste01-ref.mscx
index 57f0123e5f..4e90648612 100644
--- a/mtest/libmscore/copypaste/copypaste01-ref.mscx
+++ b/mtest/libmscore/copypaste/copypaste01-ref.mscx
@@ -134,21 +134,21 @@
           </Slur>
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="start" id="2"/>
           <Note>
             <pitch>72</pitch>
             <tpc>14</tpc>
             </Note>
-          <Slur type="start" id="2"/>
           </Chord>
         </Measure>
       <Measure number="3">
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="stop" id="2"/>
           <Note>
             <pitch>74</pitch>
             <tpc>16</tpc>
             </Note>
-          <Slur type="stop" id="2"/>
           </Chord>
         <Chord>
           <durationType>quarter</durationType>
diff --git a/mtest/libmscore/copypaste/copypaste02-ref.mscx b/mtest/libmscore/copypaste/copypaste02-ref.mscx
index 2452bc4db0..95fff18836 100644
--- a/mtest/libmscore/copypaste/copypaste02-ref.mscx
+++ b/mtest/libmscore/copypaste/copypaste02-ref.mscx
@@ -123,21 +123,21 @@
           </Slur>
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="start" id="2"/>
           <Note>
             <pitch>72</pitch>
             <tpc>14</tpc>
             </Note>
-          <Slur type="start" id="2"/>
           </Chord>
         </Measure>
       <Measure number="2">
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="stop" id="2"/>
           <Note>
             <pitch>74</pitch>
             <tpc>16</tpc>
             </Note>
-          <Slur type="stop" id="2"/>
           </Chord>
         <Chord>
           <durationType>quarter</durationType>
diff --git a/mtest/libmscore/copypaste/copypaste03-ref.mscx b/mtest/libmscore/copypaste/copypaste03-ref.mscx
index 602664e8a4..4d8198cbab 100644
--- a/mtest/libmscore/copypaste/copypaste03-ref.mscx
+++ b/mtest/libmscore/copypaste/copypaste03-ref.mscx
@@ -120,11 +120,11 @@
           </Slur>
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="start" id="2"/>
           <Note>
             <pitch>69</pitch>
             <tpc>17</tpc>
             </Note>
-          <Slur type="start" id="2"/>
           </Chord>
         <Chord>
           <durationType>quarter</durationType>
@@ -135,11 +135,11 @@
           </Chord>
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="stop" id="2"/>
           <Note>
             <pitch>72</pitch>
             <tpc>14</tpc>
             </Note>
-          <Slur type="stop" id="2"/>
           </Chord>
         </Measure>
       <Measure number="3">
@@ -185,11 +185,11 @@
           </Slur>
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="start" id="3"/>
           <Note>
             <pitch>69</pitch>
             <tpc>17</tpc>
             </Note>
-          <Slur type="start" id="3"/>
           </Chord>
         <Chord>
           <durationType>quarter</durationType>
@@ -200,11 +200,11 @@
           </Chord>
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="stop" id="3"/>
           <Note>
             <pitch>72</pitch>
             <tpc>14</tpc>
             </Note>
-          <Slur type="stop" id="3"/>
           </Chord>
         <BarLine>
           <subtype>end</subtype>
diff --git a/mtest/libmscore/copypaste/copypaste10-ref.mscx b/mtest/libmscore/copypaste/copypaste10-ref.mscx
index 3909ec35ef..17c136d3ea 100644
--- a/mtest/libmscore/copypaste/copypaste10-ref.mscx
+++ b/mtest/libmscore/copypaste/copypaste10-ref.mscx
@@ -113,38 +113,38 @@
           </Slur>
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="start" id="2"/>
           <Note>
             <pitch>67</pitch>
             <tpc>15</tpc>
             </Note>
-          <Slur type="start" id="2"/>
           </Chord>
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="stop" id="2"/>
           <Note>
             <pitch>69</pitch>
             <tpc>17</tpc>
             </Note>
-          <Slur type="stop" id="2"/>
           </Chord>
         <Slur id="3">
           <track>0</track>
           </Slur>
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="start" id="3"/>
           <Note>
             <pitch>71</pitch>
             <tpc>19</tpc>
             </Note>
-          <Slur type="start" id="3"/>
           </Chord>
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="stop" id="3"/>
           <Note>
             <pitch>72</pitch>
             <tpc>14</tpc>
             </Note>
-          <Slur type="stop" id="3"/>
           </Chord>
         </Measure>
       <Measure number="3">
@@ -183,38 +183,38 @@
           </Slur>
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="start" id="4"/>
           <Note>
             <pitch>67</pitch>
             <tpc>15</tpc>
             </Note>
-          <Slur type="start" id="4"/>
           </Chord>
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="stop" id="4"/>
           <Note>
             <pitch>69</pitch>
             <tpc>17</tpc>
             </Note>
-          <Slur type="stop" id="4"/>
           </Chord>
         <Slur id="5">
           <track>0</track>
           </Slur>
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="start" id="5"/>
           <Note>
             <pitch>71</pitch>
             <tpc>19</tpc>
             </Note>
-          <Slur type="start" id="5"/>
           </Chord>
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="stop" id="5"/>
           <Note>
             <pitch>72</pitch>
             <tpc>14</tpc>
             </Note>
-          <Slur type="stop" id="5"/>
           </Chord>
         <BarLine>
           <subtype>end</subtype>
diff --git a/mtest/libmscore/copypaste/copypaste50-ref.mscx b/mtest/libmscore/copypaste/copypaste50-ref.mscx
index ab40b19a27..bd75d5c086 100644
--- a/mtest/libmscore/copypaste/copypaste50-ref.mscx
+++ b/mtest/libmscore/copypaste/copypaste50-ref.mscx
@@ -155,11 +155,11 @@
           </Slur>
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="start" id="2"/>
           <Note>
             <pitch>69</pitch>
             <tpc>17</tpc>
             </Note>
-          <Slur type="start" id="2"/>
           </Chord>
         <Chord>
           <durationType>quarter</durationType>
@@ -170,11 +170,11 @@
           </Chord>
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="stop" id="2"/>
           <Note>
             <pitch>72</pitch>
             <tpc>14</tpc>
             </Note>
-          <Slur type="stop" id="2"/>
           </Chord>
         </Measure>
       <Measure number="3">
@@ -248,11 +248,11 @@
           </Slur>
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="start" id="3"/>
           <Note>
             <pitch>69</pitch>
             <tpc>17</tpc>
             </Note>
-          <Slur type="start" id="3"/>
           </Chord>
         <Chord>
           <durationType>quarter</durationType>
@@ -263,11 +263,11 @@
           </Chord>
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="stop" id="3"/>
           <Note>
             <pitch>72</pitch>
             <tpc>14</tpc>
             </Note>
-          <Slur type="stop" id="3"/>
           </Chord>
         </Measure>
       <Measure number="3">
diff --git a/mtest/libmscore/join/join02-ref.mscx b/mtest/libmscore/join/join02-ref.mscx
index 0d3ece0d9b..99a796b950 100644
--- a/mtest/libmscore/join/join02-ref.mscx
+++ b/mtest/libmscore/join/join02-ref.mscx
@@ -107,11 +107,11 @@
           </Slur>
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="start" id="2"/>
           <Note>
             <pitch>60</pitch>
             <tpc>14</tpc>
             </Note>
-          <Slur type="start" id="2"/>
           </Chord>
         <Chord>
           <durationType>quarter</durationType>
@@ -129,11 +129,11 @@
           </Chord>
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="stop" id="2"/>
           <Note>
             <pitch>65</pitch>
             <tpc>13</tpc>
             </Note>
-          <Slur type="stop" id="2"/>
           </Chord>
         <BarLine>
           <subtype>end</subtype>
diff --git a/mtest/libmscore/join/join05-ref.mscx b/mtest/libmscore/join/join05-ref.mscx
index 06fab2244c..c9b21a2a0c 100644
--- a/mtest/libmscore/join/join05-ref.mscx
+++ b/mtest/libmscore/join/join05-ref.mscx
@@ -128,21 +128,21 @@
           </Slur>
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="start" id="2"/>
           <Note>
             <pitch>65</pitch>
             <tpc>13</tpc>
             </Note>
-          <Slur type="start" id="2"/>
           </Chord>
         </Measure>
       <Measure number="2">
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="stop" id="2"/>
           <Note>
             <pitch>67</pitch>
             <tpc>15</tpc>
             </Note>
-          <Slur type="stop" id="2"/>
           </Chord>
         <Chord>
           <durationType>quarter</durationType>
diff --git a/mtest/libmscore/join/join06-ref.mscx b/mtest/libmscore/join/join06-ref.mscx
index 8ede973fc1..031c14103a 100644
--- a/mtest/libmscore/join/join06-ref.mscx
+++ b/mtest/libmscore/join/join06-ref.mscx
@@ -128,11 +128,11 @@
           </Slur>
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="start" id="2"/>
           <Note>
             <pitch>62</pitch>
             <tpc>16</tpc>
             </Note>
-          <Slur type="start" id="2"/>
           </Chord>
         </Measure>
       <Measure number="2">
diff --git a/mtest/libmscore/parts/part-all-appendmeasures.mscx b/mtest/libmscore/parts/part-all-appendmeasures.mscx
index 6310cb9300..c136baeb13 100644
--- a/mtest/libmscore/parts/part-all-appendmeasures.mscx
+++ b/mtest/libmscore/parts/part-all-appendmeasures.mscx
@@ -301,12 +301,12 @@
         <Chord>
           <lid>36</lid>
           <durationType>quarter</durationType>
+          <Slur type="start" id="3"/>
           <Note>
             <lid>37</lid>
             <pitch>67</pitch>
             <tpc>15</tpc>
             </Note>
-          <Slur type="start" id="3"/>
           </Chord>
         <Chord>
           <lid>38</lid>
@@ -329,12 +329,12 @@
         <Chord>
           <lid>42</lid>
           <durationType>quarter</durationType>
+          <Slur type="stop" id="3"/>
           <Note>
             <lid>43</lid>
             <pitch>67</pitch>
             <tpc>15</tpc>
             </Note>
-          <Slur type="stop" id="3"/>
           </Chord>
         </Measure>
       <Measure number="5">
@@ -1191,12 +1191,12 @@
           <Chord>
             <lid>36</lid>
             <durationType>quarter</durationType>
+            <Slur type="start" id="6"/>
             <Note>
               <lid>37</lid>
               <pitch>67</pitch>
               <tpc>15</tpc>
               </Note>
-            <Slur type="start" id="6"/>
             </Chord>
           <Chord>
             <lid>38</lid>
@@ -1219,12 +1219,12 @@
           <Chord>
             <lid>42</lid>
             <durationType>quarter</durationType>
+            <Slur type="stop" id="6"/>
             <Note>
               <lid>43</lid>
               <pitch>67</pitch>
               <tpc>15</tpc>
               </Note>
-            <Slur type="stop" id="6"/>
             </Chord>
           </Measure>
         <Measure number="5">
diff --git a/mtest/libmscore/parts/part-all-parts.mscx b/mtest/libmscore/parts/part-all-parts.mscx
index 049db6132e..c8a0307693 100644
--- a/mtest/libmscore/parts/part-all-parts.mscx
+++ b/mtest/libmscore/parts/part-all-parts.mscx
@@ -301,12 +301,12 @@
         <Chord>
           <lid>36</lid>
           <durationType>quarter</durationType>
+          <Slur type="start" id="3"/>
           <Note>
             <lid>37</lid>
             <pitch>67</pitch>
             <tpc>15</tpc>
             </Note>
-          <Slur type="start" id="3"/>
           </Chord>
         <Chord>
           <lid>38</lid>
@@ -329,12 +329,12 @@
         <Chord>
           <lid>42</lid>
           <durationType>quarter</durationType>
+          <Slur type="stop" id="3"/>
           <Note>
             <lid>43</lid>
             <pitch>67</pitch>
             <tpc>15</tpc>
             </Note>
-          <Slur type="stop" id="3"/>
           </Chord>
         </Measure>
       <Measure number="5">
@@ -1183,12 +1183,12 @@
           <Chord>
             <lid>36</lid>
             <durationType>quarter</durationType>
+            <Slur type="start" id="6"/>
             <Note>
               <lid>37</lid>
               <pitch>67</pitch>
               <tpc>15</tpc>
               </Note>
-            <Slur type="start" id="6"/>
             </Chord>
           <Chord>
             <lid>38</lid>
@@ -1211,12 +1211,12 @@
           <Chord>
             <lid>42</lid>
             <durationType>quarter</durationType>
+            <Slur type="stop" id="6"/>
             <Note>
               <lid>43</lid>
               <pitch>67</pitch>
               <tpc>15</tpc>
               </Note>
-            <Slur type="stop" id="6"/>
             </Chord>
           </Measure>
         <Measure number="5">
diff --git a/mtest/libmscore/parts/part-all-uappendmeasures.mscx b/mtest/libmscore/parts/part-all-uappendmeasures.mscx
index fa6663a877..41056bc2e3 100644
--- a/mtest/libmscore/parts/part-all-uappendmeasures.mscx
+++ b/mtest/libmscore/parts/part-all-uappendmeasures.mscx
@@ -301,12 +301,12 @@
         <Chord>
           <lid>36</lid>
           <durationType>quarter</durationType>
+          <Slur type="start" id="3"/>
           <Note>
             <lid>37</lid>
             <pitch>67</pitch>
             <tpc>15</tpc>
             </Note>
-          <Slur type="start" id="3"/>
           </Chord>
         <Chord>
           <lid>38</lid>
@@ -329,12 +329,12 @@
         <Chord>
           <lid>42</lid>
           <durationType>quarter</durationType>
+          <Slur type="stop" id="3"/>
           <Note>
             <lid>43</lid>
             <pitch>67</pitch>
             <tpc>15</tpc>
             </Note>
-          <Slur type="stop" id="3"/>
           </Chord>
         </Measure>
       <Measure number="5">
@@ -1179,12 +1179,12 @@
           <Chord>
             <lid>36</lid>
             <durationType>quarter</durationType>
+            <Slur type="start" id="6"/>
             <Note>
               <lid>37</lid>
               <pitch>67</pitch>
               <tpc>15</tpc>
               </Note>
-            <Slur type="start" id="6"/>
             </Chord>
           <Chord>
             <lid>38</lid>
@@ -1207,12 +1207,12 @@
           <Chord>
             <lid>42</lid>
             <durationType>quarter</durationType>
+            <Slur type="stop" id="6"/>
             <Note>
               <lid>43</lid>
               <pitch>67</pitch>
               <tpc>15</tpc>
               </Note>
-            <Slur type="stop" id="6"/>
             </Chord>
           </Measure>
         <Measure number="5">
diff --git a/mtest/libmscore/parts/part-all-uinsertmeasures.mscx b/mtest/libmscore/parts/part-all-uinsertmeasures.mscx
index fa6663a877..41056bc2e3 100644
--- a/mtest/libmscore/parts/part-all-uinsertmeasures.mscx
+++ b/mtest/libmscore/parts/part-all-uinsertmeasures.mscx
@@ -301,12 +301,12 @@
         <Chord>
           <lid>36</lid>
           <durationType>quarter</durationType>
+          <Slur type="start" id="3"/>
           <Note>
             <lid>37</lid>
             <pitch>67</pitch>
             <tpc>15</tpc>
             </Note>
-          <Slur type="start" id="3"/>
           </Chord>
         <Chord>
           <lid>38</lid>
@@ -329,12 +329,12 @@
         <Chord>
           <lid>42</lid>
           <durationType>quarter</durationType>
+          <Slur type="stop" id="3"/>
           <Note>
             <lid>43</lid>
             <pitch>67</pitch>
             <tpc>15</tpc>
             </Note>
-          <Slur type="stop" id="3"/>
           </Chord>
         </Measure>
       <Measure number="5">
@@ -1179,12 +1179,12 @@
           <Chord>
             <lid>36</lid>
             <durationType>quarter</durationType>
+            <Slur type="start" id="6"/>
             <Note>
               <lid>37</lid>
               <pitch>67</pitch>
               <tpc>15</tpc>
               </Note>
-            <Slur type="start" id="6"/>
             </Chord>
           <Chord>
             <lid>38</lid>
@@ -1207,12 +1207,12 @@
           <Chord>
             <lid>42</lid>
             <durationType>quarter</durationType>
+            <Slur type="stop" id="6"/>
             <Note>
               <lid>43</lid>
               <pitch>67</pitch>
               <tpc>15</tpc>
               </Note>
-            <Slur type="stop" id="6"/>
             </Chord>
           </Measure>
         <Measure number="5">
diff --git a/mtest/libmscore/parts/part-all.mscx b/mtest/libmscore/parts/part-all.mscx
index 568b2c69ab..f2b920b3ab 100644
--- a/mtest/libmscore/parts/part-all.mscx
+++ b/mtest/libmscore/parts/part-all.mscx
@@ -265,14 +265,7 @@
           </Slur>
         <Chord>
           <durationType>quarter</durationType>
-          <Note>
-            <pitch>67</pitch>
-            <tpc>15</tpc>
-            </Note>
           <Slur type="start" id="3"/>
-          </Chord>
-        <Chord>
-          <durationType>quarter</durationType>
           <Note>
             <pitch>67</pitch>
             <tpc>15</tpc>
@@ -291,7 +284,14 @@
             <pitch>67</pitch>
             <tpc>15</tpc>
             </Note>
+          </Chord>
+        <Chord>
+          <durationType>quarter</durationType>
           <Slur type="stop" id="3"/>
+          <Note>
+            <pitch>67</pitch>
+            <tpc>15</tpc>
+            </Note>
           </Chord>
         </Measure>
       <Measure number="5">
diff --git a/mtest/libmscore/selectionfilter/selectionfilter6-base-ref.xml b/mtest/libmscore/selectionfilter/selectionfilter6-base-ref.xml
index f490c68a77..e6244ecf2f 100644
--- a/mtest/libmscore/selectionfilter/selectionfilter6-base-ref.xml
+++ b/mtest/libmscore/selectionfilter/selectionfilter6-base-ref.xml
@@ -9,22 +9,22 @@
     <Chord>
       <track>0</track>
       <durationType>quarter</durationType>
+      <Slur type="start" id="2"/>
       <Note>
         <track>0</track>
         <pitch>72</pitch>
         <tpc>14</tpc>
         </Note>
-      <Slur type="start" id="2"/>
       </Chord>
     <Chord>
       <track>0</track>
       <durationType>quarter</durationType>
+      <Slur type="stop" id="2"/>
       <Note>
         <track>0</track>
         <pitch>74</pitch>
         <tpc>16</tpc>
         </Note>
-      <Slur type="stop" id="2"/>
       </Chord>
     <Slur id="3">
       <track>0</track>
@@ -32,22 +32,22 @@
     <Chord>
       <track>0</track>
       <durationType>quarter</durationType>
+      <Slur type="start" id="3"/>
       <Note>
         <track>0</track>
         <pitch>76</pitch>
         <tpc>18</tpc>
         </Note>
-      <Slur type="start" id="3"/>
       </Chord>
     <Chord>
       <track>0</track>
       <durationType>quarter</durationType>
+      <Slur type="stop" id="3"/>
       <Note>
         <track>0</track>
         <pitch>77</pitch>
         <tpc>13</tpc>
         </Note>
-      <Slur type="stop" id="3"/>
       </Chord>
     </Staff>
   </StaffList>
diff --git a/mtest/libmscore/selectionfilter/updateReference b/mtest/libmscore/selectionfilter/updateReference
index 6ecbe5d852..c2d8d31c97 100755
--- a/mtest/libmscore/selectionfilter/updateReference
+++ b/mtest/libmscore/selectionfilter/updateReference
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+cp ../../../build.debug/mtest/libmscore/selectionfilter/selectionfilter6-base.xml selectionfilter6-base-ref.xml
 cp ../../../build.debug/mtest/libmscore/selectionfilter/selectionfilter8-base.xml selectionfilter8-base-ref.xml
 cp ../../../build.debug/mtest/libmscore/selectionfilter/selectionfilter9-base.xml selectionfilter9-base-ref.xml
 
diff --git a/mtest/libmscore/split/split02-ref.mscx b/mtest/libmscore/split/split02-ref.mscx
index a1ca728510..c1853c5c1c 100644
--- a/mtest/libmscore/split/split02-ref.mscx
+++ b/mtest/libmscore/split/split02-ref.mscx
@@ -111,11 +111,11 @@
           </Slur>
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="start" id="2"/>
           <Note>
             <pitch>60</pitch>
             <tpc>14</tpc>
             </Note>
-          <Slur type="start" id="2"/>
           </Chord>
         <Chord>
           <durationType>quarter</durationType>
@@ -135,11 +135,11 @@
           </Chord>
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="stop" id="2"/>
           <Note>
             <pitch>65</pitch>
             <tpc>13</tpc>
             </Note>
-          <Slur type="stop" id="2"/>
           </Chord>
         <BarLine>
           <subtype>end</subtype>
diff --git a/mtest/libmscore/split/split05-ref.mscx b/mtest/libmscore/split/split05-ref.mscx
index 734a576d6e..1a932d96c0 100644
--- a/mtest/libmscore/split/split05-ref.mscx
+++ b/mtest/libmscore/split/split05-ref.mscx
@@ -134,21 +134,21 @@
           </Slur>
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="start" id="2"/>
           <Note>
             <pitch>65</pitch>
             <tpc>13</tpc>
             </Note>
-          <Slur type="start" id="2"/>
           </Chord>
         </Measure>
       <Measure number="3">
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="stop" id="2"/>
           <Note>
             <pitch>67</pitch>
             <tpc>15</tpc>
             </Note>
-          <Slur type="stop" id="2"/>
           </Chord>
         <Chord>
           <durationType>quarter</durationType>
diff --git a/mtest/libmscore/split/split06-ref.mscx b/mtest/libmscore/split/split06-ref.mscx
index 86af6ff099..baaa249a39 100644
--- a/mtest/libmscore/split/split06-ref.mscx
+++ b/mtest/libmscore/split/split06-ref.mscx
@@ -128,11 +128,11 @@
           </Slur>
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="start" id="2"/>
           <Note>
             <pitch>62</pitch>
             <tpc>16</tpc>
             </Note>
-          <Slur type="start" id="2"/>
           </Chord>
         </Measure>
       <Measure number="2" len="1/2">
diff --git a/mtest/libmscore/split/split08-ref.mscx b/mtest/libmscore/split/split08-ref.mscx
index 17533fec18..b4d64476e2 100644
--- a/mtest/libmscore/split/split08-ref.mscx
+++ b/mtest/libmscore/split/split08-ref.mscx
@@ -162,19 +162,19 @@
           </Slur>
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="start" id="2"/>
           <Note>
             <pitch>72</pitch>
             <tpc>14</tpc>
             </Note>
-          <Slur type="start" id="2"/>
           </Chord>
         <Chord>
           <durationType>quarter</durationType>
+          <Slur type="stop" id="2"/>
           <Note>
             <pitch>74</pitch>
             <tpc>16</tpc>
             </Note>
-          <Slur type="stop" id="2"/>
           </Chord>
         <Chord>
           <durationType>quarter</durationType>