diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/NaturalComparator.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/NaturalComparator.java
index 33a2d247546..f27c8d433c0 100755
--- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/NaturalComparator.java
+++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/NaturalComparator.java
@@ -13,7 +13,7 @@ import java.util.Comparator;
 public class NaturalComparator implements Comparator<String> {
     boolean caseSensitive;
     
-    public NaturalComparator(boolean caseSensitive){
+    public NaturalComparator(boolean caseSensitive) {
         this.caseSensitive = caseSensitive;
     }
     
@@ -26,7 +26,7 @@ public class NaturalComparator implements Comparator<String> {
      */
     @Override
     public int compare(String a, String b) {
-        if(!caseSensitive){
+        if (!caseSensitive){
             a = a.toLowerCase();
             b = a.toLowerCase();
         }
diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/NaturalComparatorTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/NaturalComparatorTest.java
index a3dd0421262..8012198284a 100644
--- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/NaturalComparatorTest.java
+++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/NaturalComparatorTest.java
@@ -3,6 +3,10 @@ package com.sap.sailing.domain.common.test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
 import org.junit.Before;
 import org.junit.Test;
 
@@ -103,5 +107,12 @@ public class NaturalComparatorTest {
         assertTrue(comparator.compare("0.01", "0.2") < 0);
         assertTrue(comparator.compare("0.1.5b", "0.2a") < 0);
     }
+    
+    @Test
+    public void testSortSailIDs() {
+        List<String> list = Arrays.asList("Groupama", "GER8829", "A", "FRA 56893", "Cam", "GAC Pindar", "Grün", "a/m", "d/n");
+        Collections.sort(list, new NaturalComparator(/* case sensitive */ false));
+        assertTrue(list.indexOf("A") < list.indexOf("Cam"));
+    }
 
 }
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorTableWrapper.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorTableWrapper.java
index 38fee020d78..389018f79b7 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorTableWrapper.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorTableWrapper.java
@@ -58,9 +58,10 @@ public class CompetitorTableWrapper extends TableWrapper<CompetitorDTO, MultiSel
         };
         boatClassColumn.setSortable(true);
         competitorColumnListHandler.setComparator(boatClassColumn, new Comparator<CompetitorDTO>() {
+            private final NaturalComparator comparator = new NaturalComparator(/* caseSensitive */ false);
             @Override
             public int compare(CompetitorDTO o1, CompetitorDTO o2) {
-                return new NaturalComparator(false).compare(o1.getBoatClass().getName(), o2.getBoatClass().getName());
+                return comparator.compare(o1.getBoatClass().getName(), o2.getBoatClass().getName());
             }
         });
         
@@ -86,9 +87,10 @@ public class CompetitorTableWrapper extends TableWrapper<CompetitorDTO, MultiSel
         };
         sailIdColumn.setSortable(true);
         competitorColumnListHandler.setComparator(sailIdColumn, new Comparator<CompetitorDTO>() {
+            private final NaturalComparator comparator = new NaturalComparator(/* case sensitive */ false);
             @Override
             public int compare(CompetitorDTO o1, CompetitorDTO o2) {
-                return new NaturalComparator(false).compare(o1.getSailID(), o2.getSailID());
+                return comparator.compare(o1.getSailID(), o2.getSailID());
             }
         });
 
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TableWrapper.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TableWrapper.java
index b6a633b09d9..893021f914a 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TableWrapper.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TableWrapper.java
@@ -39,12 +39,9 @@ public abstract class TableWrapper<T, S extends SelectionModel<T>> implements Is
         this.selectionModel = selectionModel;
         this.dataProvider = new ListDataProvider<T>();
         mainPanel = new VerticalPanel();
-        
         table = new CellTable<T>(10000, tableRes);
-        
         dataProvider.addDataDisplay(table);
         table.setSelectionModel(selectionModel);
-        
         mainPanel.add(table);
     }
     
diff --git a/java/target/http2udpmirror b/java/target/http2udpmirror
index 2d2a00486ba..de1e1ea58bb 100755
--- a/java/target/http2udpmirror
+++ b/java/target/http2udpmirror
@@ -1,5 +1,4 @@
 #!/bin/sh
-#!/bin/sh
 target="`dirname \"$0\"`"
 pwd=`pwd`
 echo "$target" | grep "^/"
diff --git a/java/target/http2udpmirror_axel b/java/target/http2udpmirror_axel
index cf7f7e0c5dd..b15ffc64a73 100755
--- a/java/target/http2udpmirror_axel
+++ b/java/target/http2udpmirror_axel
@@ -1,16 +1,15 @@
-#!/bin/sh
-#!/bin/sh
-target="`dirname \"$0\"`"
-pwd=`pwd`
-echo "$target" | grep "^/"
-if [ "$0" != "0" ]; then
-  # no leading slash, therefore no absolute path; prepend pwd
-  target="$pwd/$target"
-fi
-target=c:/data/SAP/sailing/workspace/java/target
-echo target is $target
-cd "$target/../com.sap.sailing.feature.p2build/bin/products/raceanalysis.product.id/win32/win32/x86_64"
-echo pwd is now `pwd`
-classpath="`find plugins -name 'com.sap.sailing.expeditionconnector_*.jar' | sort | tail -1`;`find plugins -name 'com.sap.sailing.domain.common_*.jar' | sort | tail -1`"
-echo Using classpath $classpath
-"$JAVA_HOME/bin/java" -cp "$classpath" -Djava.util.logging.config.file=$target/configuration/logging.properties com.sap.sailing.expeditionconnector.FromHttpToUdpMirror $*
+#!/bin/sh
+target="`dirname \"$0\"`"
+pwd=`pwd`
+echo "$target" | grep "^/"
+if [ "$0" != "0" ]; then
+  # no leading slash, therefore no absolute path; prepend pwd
+  target="$pwd/$target"
+fi
+target=c:/data/SAP/sailing/workspace/java/target
+echo target is $target
+cd "$target/../com.sap.sailing.feature.p2build/bin/products/raceanalysis.product.id/win32/win32/x86_64"
+echo pwd is now `pwd`
+classpath="`find plugins -name 'com.sap.sailing.expeditionconnector_*.jar' | sort | tail -1`;`find plugins -name 'com.sap.sailing.domain.common_*.jar' | sort | tail -1`"
+echo Using classpath $classpath
+"$JAVA_HOME/bin/java" -cp "$classpath" -Djava.util.logging.config.file=$target/configuration/logging.properties com.sap.sailing.expeditionconnector.FromHttpToUdpMirror $*