diff --git a/.vscode/settings.json b/.vscode/settings.json
index e78ab87e6cf..dc54e6a8344 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,4 +1,4 @@
 {
     "actions": [],
-    "SAP HANA Database Artifacts.lastSelectedTargetPath": "/home/user/projects/Sailing-Analytics/db/src/geo"
+    "SAP HANA Database Artifacts.lastSelectedTargetPath": "/home/user/projects/Sailing-Analytics/db/src"
 }
\ No newline at end of file
diff --git a/db/.gitignore b/db/.gitignore
index 344881ba2bf..7c1c8729896 100644
--- a/db/.gitignore
+++ b/db/.gitignore
@@ -1,3 +1,4 @@
 **/node_modules/**
 .env*
-race-stats-with-param.hdbcalculationview
\ No newline at end of file
+race-stats-with-param.hdbcalculationview
+.vscode/settings.json
\ No newline at end of file
diff --git a/db/src/race.hdbcalculationview b/db/src/race.hdbcalculationview
index de93d6244c8..a5d2d69c83a 100644
--- a/db/src/race.hdbcalculationview
+++ b/db/src/race.hdbcalculationview
@@ -450,7 +450,7 @@
     <shape modelObjectName="RegattaJoin_2" modelObjectNameSpace="RaceJoin" modelObjectType="JoinNodeInput">
       <upperLeftCorner x="320" y="30"/>
       <rectangleSize width="250"/>
-    </shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape>
+    </shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape><shape><upperLeftCorner/><rectangleSize/></shape>
     <shape expanded="true" modelObjectName="RegattaJoin" modelObjectNameSpace="CalculationView">
       <upperLeftCorner x="302" y="376"/>
       <rectangleSize height="30" width="160"/>
diff --git a/db/src/sailing-race-stat-ranks.hdbcalculationview b/db/src/sailing-race-stat-ranks.hdbcalculationview
index 81e9240b23f..0363255e3f5 100644
--- a/db/src/sailing-race-stat-ranks.hdbcalculationview
+++ b/db/src/sailing-race-stat-ranks.hdbcalculationview
@@ -93,7 +93,6 @@
       <viewAttribute id="startDelayRank" aggregationType="sum"/>
       <viewAttribute id="StartlineDistanceRank" aggregationType="sum"/>
       <viewAttribute id="StartlineSpeedRank" aggregationType="sum"/>
-    
       <viewAttribute id="distanceSailedRank" aggregationType="sum"/>
     </viewAttributes>
     <calculatedViewAttributes/>
@@ -105,7 +104,6 @@
       <mapping xsi:type="Calculation:AttributeMapping" target="startDelayRank" source="startDelayRank"/>
       <mapping xsi:type="Calculation:ConstantAttributeMapping" target="StartlineDistanceRank" null="true" value=""/>
       <mapping xsi:type="Calculation:ConstantAttributeMapping" target="StartlineSpeedRank" null="true" value=""/>
-    
       <mapping xsi:type="Calculation:ConstantAttributeMapping" target="distanceSailedRank" null="true" value=""/>
     </input>
   
@@ -121,8 +119,6 @@
   
       <mapping xsi:type="Calculation:ConstantAttributeMapping" target="StartlineSpeedRank" null="true" value=""/>
   
-    
-  
       <mapping xsi:type="Calculation:ConstantAttributeMapping" target="distanceSailedRank" null="true" value=""/>
   
     </input>
@@ -134,55 +130,21 @@
       <mapping xsi:type="Calculation:ConstantAttributeMapping" target="startDelayRank" null="true" value=""/>
       <mapping xsi:type="Calculation:ConstantAttributeMapping" target="StartlineDistanceRank" null="true" value=""/>
       <mapping xsi:type="Calculation:AttributeMapping" target="StartlineSpeedRank" source="StartlineSpeedRank"/>
-    
       <mapping xsi:type="Calculation:ConstantAttributeMapping" target="distanceSailedRank" null="true" value=""/>
     </input>
   
-    <input node="DistSailedRanking">
+    <input node="DistSailedRanking" emptyUnionBehavior="NO_ROW">
       <mapping xsi:type="Calculation:AttributeMapping" target="regatta" source="regatta"/>
       <mapping xsi:type="Calculation:AttributeMapping" target="raceName" source="raceName"/>
       <mapping xsi:type="Calculation:AttributeMapping" target="competitorId" source="competitorId"/>
       <mapping xsi:type="Calculation:ConstantAttributeMapping" target="startDelayRank" null="true" value=""/>
       <mapping xsi:type="Calculation:ConstantAttributeMapping" target="StartlineDistanceRank" null="true" value=""/>
       <mapping xsi:type="Calculation:ConstantAttributeMapping" target="StartlineSpeedRank" null="true" value=""/>
+  
       <mapping xsi:type="Calculation:AttributeMapping" target="distanceSailedRank" source="distanceSailedRank"/>
+  
     </input>
   </calculationView>
-  <calculationView xsi:type="Calculation:JoinView" id="Join_1" cardinality="C1_1" joinType="leftOuter">
-    <viewAttributes>
-      <viewAttribute id="regatta"/>
-      <viewAttribute id="raceName"/>
-      <viewAttribute id="competitorId"/>
-      <viewAttribute id="startDelayRank" aggregationType="sum"/>
-      <viewAttribute id="StartlineDistanceRank" aggregationType="sum"/>
-      <viewAttribute id="StartlineSpeedRank" aggregationType="sum"/>
-      <viewAttribute id="name"/>
-      <viewAttribute id="shortName"/>
-      <viewAttribute id="nationality"/>
-      <viewAttribute id="sailNumber"/>
-    
-      <viewAttribute id="distanceSailedRank" aggregationType="sum"/>
-    </viewAttributes>
-    <calculatedViewAttributes/>
-    <input node="Union_1">
-      <mapping xsi:type="Calculation:AttributeMapping" target="regatta" source="regatta"/>
-      <mapping xsi:type="Calculation:AttributeMapping" target="raceName" source="raceName"/>
-      <mapping xsi:type="Calculation:AttributeMapping" target="competitorId" source="competitorId"/>
-      <mapping xsi:type="Calculation:AttributeMapping" target="startDelayRank" source="startDelayRank"/>
-      <mapping xsi:type="Calculation:AttributeMapping" target="StartlineDistanceRank" source="StartlineDistanceRank"/>
-      <mapping xsi:type="Calculation:AttributeMapping" target="StartlineSpeedRank" source="StartlineSpeedRank"/>
-    
-      <mapping xsi:type="Calculation:AttributeMapping" target="distanceSailedRank" source="distanceSailedRank"/>
-    </input>
-    <input node="Competitor">
-      <mapping xsi:type="Calculation:AttributeMapping" target="name" source="name"/>
-      <mapping xsi:type="Calculation:AttributeMapping" target="shortName" source="shortName"/>
-      <mapping xsi:type="Calculation:AttributeMapping" target="nationality" source="nationality"/>
-      <mapping xsi:type="Calculation:AttributeMapping" target="sailNumber" source="sailNumber"/>
-      <mapping xsi:type="Calculation:AttributeMapping" target="competitorId" source="id"/>
-    </input>
-    <joinAttribute name="competitorId"/>
-  </calculationView>
   <calculationView xsi:type="Calculation:RankView" id="DistSailedRanking">
     <viewAttributes>
       <viewAttribute id="regatta"/>
@@ -202,6 +164,39 @@
       <rankViewAttributeName>distanceSailedRank</rankViewAttributeName>
     </rankingFilter>
   </calculationView>
+  <calculationView xsi:type="Calculation:JoinView" id="Join_1" cardinality="C1_1" joinType="leftOuter">
+    <viewAttributes>
+      <viewAttribute id="regatta"/>
+      <viewAttribute id="raceName"/>
+      <viewAttribute id="competitorId"/>
+      <viewAttribute id="startDelayRank" aggregationType="sum"/>
+      <viewAttribute id="StartlineDistanceRank" aggregationType="sum"/>
+      <viewAttribute id="StartlineSpeedRank" aggregationType="sum"/>
+      <viewAttribute id="name"/>
+      <viewAttribute id="shortName"/>
+      <viewAttribute id="nationality"/>
+      <viewAttribute id="sailNumber"/>
+      <viewAttribute id="distanceSailedRank" aggregationType="sum"/>
+    </viewAttributes>
+    <calculatedViewAttributes/>
+    <input node="Union_1">
+      <mapping xsi:type="Calculation:AttributeMapping" target="regatta" source="regatta"/>
+      <mapping xsi:type="Calculation:AttributeMapping" target="raceName" source="raceName"/>
+      <mapping xsi:type="Calculation:AttributeMapping" target="competitorId" source="competitorId"/>
+      <mapping xsi:type="Calculation:AttributeMapping" target="startDelayRank" source="startDelayRank"/>
+      <mapping xsi:type="Calculation:AttributeMapping" target="StartlineDistanceRank" source="StartlineDistanceRank"/>
+      <mapping xsi:type="Calculation:AttributeMapping" target="StartlineSpeedRank" source="StartlineSpeedRank"/>
+      <mapping xsi:type="Calculation:AttributeMapping" target="distanceSailedRank" source="distanceSailedRank"/>
+    </input>
+    <input node="Competitor">
+      <mapping xsi:type="Calculation:AttributeMapping" target="name" source="name"/>
+      <mapping xsi:type="Calculation:AttributeMapping" target="shortName" source="shortName"/>
+      <mapping xsi:type="Calculation:AttributeMapping" target="nationality" source="nationality"/>
+      <mapping xsi:type="Calculation:AttributeMapping" target="sailNumber" source="sailNumber"/>
+      <mapping xsi:type="Calculation:AttributeMapping" target="competitorId" source="id"/>
+    </input>
+    <joinAttribute name="competitorId"/>
+  </calculationView>
   <calculationView xsi:type="Calculation:AggregationView" id="RaceDistanceSailed">
     <viewAttributes>
       <viewAttribute id="regatta"/>
@@ -253,22 +248,23 @@
   </attributes>
   <calculatedAttributes/>
   <baseMeasures>
-    <measure id="distanceSailedRank" order="8" aggregationType="sum" measureType="simple">
-      <descriptions defaultDescription="distanceSailedRank"/>
-      <measureMapping columnObjectName="Join_1" columnName="distanceSailedRank"/>
-    </measure>
-    <measure id="startDelayRank" order="9" aggregationType="sum" measureType="simple">
+    <measure id="startDelayRank" order="8" aggregationType="sum" measureType="simple">
       <descriptions defaultDescription="startDelayRank"/>
       <measureMapping columnObjectName="Join_1" columnName="startDelayRank"/>
     </measure>
-    <measure id="StartlineDistanceRank" order="10" aggregationType="sum" measureType="simple">
+    <measure id="StartlineDistanceRank" order="9" aggregationType="sum" measureType="simple">
       <descriptions defaultDescription="StartlineDistanceRank"/>
       <measureMapping columnObjectName="Join_1" columnName="StartlineDistanceRank"/>
     </measure>
-    <measure id="StartlineSpeedRank" order="11" aggregationType="sum" measureType="simple">
+    <measure id="StartlineSpeedRank" order="10" aggregationType="sum" measureType="simple">
       <descriptions defaultDescription="StartlineSpeedRank"/>
       <measureMapping columnObjectName="Join_1" columnName="StartlineSpeedRank"/>
     </measure>
+  
+    <measure id="distanceSailedRank" order="11" aggregationType="sum" measureType="simple">
+      <descriptions defaultDescription="distanceSailedRank"/>
+      <measureMapping columnObjectName="Join_1" columnName="distanceSailedRank"/>
+    </measure>
   </baseMeasures>
   <calculatedMeasures/>
   <restrictedMeasures/>
@@ -277,32 +273,37 @@
 <layout>
   <shapes>
     <shape expanded="true" modelObjectName="Output" modelObjectNameSpace="MeasureGroup">
-      <upperLeftCorner x="504.28437919115527" y="112"/>
+      <upperLeftCorner x="504" y="112"/>
     
       <rectangleSize width="160"/>
     </shape>
     
   
     <shape expanded="true" modelObjectName="StartDelayRanking" modelObjectNameSpace="CalculationView">
-      <upperLeftCorner x="785.5" y="566.9999976158142"/>
+      <upperLeftCorner x="785" y="566"/>
       <rectangleSize height="30" width="160"/>
     </shape>
     <shape expanded="true" modelObjectName="StartlineDistanceRanking" modelObjectNameSpace="CalculationView">
-      <upperLeftCorner x="520.5" y="566.9999976158142"/>
+      <upperLeftCorner x="520" y="566"/>
       <rectangleSize height="30" width="215"/>
     </shape>
     <shape expanded="true" modelObjectName="StartlineSpeedRanking" modelObjectNameSpace="CalculationView">
-      <upperLeftCorner x="310.50000000000006" y="566.9999976158142"/>
+      <upperLeftCorner x="310" y="566"/>
       <rectangleSize height="30" width="160"/>
     </shape>
   
     <shape expanded="true" modelObjectName="Union_1" modelObjectNameSpace="CalculationView">
-      <upperLeftCorner x="486.45507679489947" y="376.9999988079071"/>
+      <upperLeftCorner x="486" y="376"/>
+      <rectangleSize height="30" width="160"/>
+    </shape>
+  
+    <shape expanded="true" modelObjectName="DistSailedRanking" modelObjectNameSpace="CalculationView">
+      <upperLeftCorner x="102" y="556"/>
       <rectangleSize height="30" width="160"/>
     </shape>
   
     <shape expanded="true" modelObjectName="Join_1" modelObjectNameSpace="CalculationView">
-      <upperLeftCorner x="486.45507679489947" y="237"/>
+      <upperLeftCorner x="486" y="237"/>
       <rectangleSize height="30" width="160"/>
     </shape>
     <shape modelObjectName="Union_1" modelObjectNameSpace="Join_1" modelObjectType="JoinNodeInput">
@@ -313,13 +314,8 @@
       <upperLeftCorner x="320" y="30"/>
       <rectangleSize width="194"/>
     </shape>
-  
-    <shape expanded="true" modelObjectName="DistSailedRanking" modelObjectNameSpace="CalculationView">
-      <upperLeftCorner x="100.5" y="566.9999976158142"/>
-      <rectangleSize height="30" width="160"/>
-    </shape>
     <shape expanded="true" modelObjectName="RaceDistanceSailed" modelObjectNameSpace="CalculationView">
-      <upperLeftCorner x="92" y="671.9999976158142"/>
+      <upperLeftCorner x="92" y="671"/>
       <rectangleSize height="30" width="177"/>
     </shape>
   </shapes>
diff --git a/db/src/sailing-race-stats.hdbcalculationview b/db/src/sailing-race-stats.hdbcalculationview
index 2bbb54e0a98..a5bfcf1739c 100644
--- a/db/src/sailing-race-stats.hdbcalculationview
+++ b/db/src/sailing-race-stats.hdbcalculationview
@@ -1096,7 +1096,7 @@
       <rectangleSize height="30" width="184"/>
     </shape>
     <shape expanded="true" modelObjectName="RaceEventView" modelObjectNameSpace="CalculationView">
-      <upperLeftCorner x="334" y="406"/>
+      <upperLeftCorner x="305" y="580"/>
       <rectangleSize height="30" width="160"/>
     </shape>
     <shape expanded="true" modelObjectName="RaceStatsProj2" modelObjectNameSpace="CalculationView">
@@ -1145,8 +1145,8 @@
       <rectangleSize width="205"/>
     </shape>
     <shape modelObjectName="RaceStatAverages" modelObjectNameSpace="Join_1" modelObjectType="JoinNodeInput" multiJoinViewNodeName="Join_1">
-      <upperLeftCorner x="1039" y="54"/>
-      <rectangleSize width="315"/>
+      <upperLeftCorner x="10" y="15"/>
+      <rectangleSize width="363"/>
     </shape></shapes>
 </layout>
 </Calculation:scenario>
\ No newline at end of file
diff --git a/mta.yaml b/mta.yaml
index 98c667a28a6..cbab8d9e819 100644
--- a/mta.yaml
+++ b/mta.yaml
@@ -1,3 +1,5 @@
+#This is required for the SAC sailing analytics showcase
+#(presumably in the root folder, see bug5451)
 _schema-version: "2.1"
 ID: Sailing-Analytics
 version: 0.0.1