diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index abd7b33..928bef1 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -17,6 +17,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.PostConstruct;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
@@ -456,7 +457,8 @@ public class Controller {
     List<TeamRankingListHelper> sendBackTeams = new LinkedList<>();
     List<Object[]> rankingTeams = userRepository.getTeamRankingList();
     for (Object[] obj : rankingTeams) {
-      TeamRankingListHelper tmp = new TeamRankingListHelper((String) obj[0], (Integer) obj[1]);
+      BigDecimal i = (BigDecimal) obj[1];
+      TeamRankingListHelper tmp = new TeamRankingListHelper((String) obj[0], i.intValue());
       System.out.println(tmp);
       sendBackTeams.add(tmp);
     }
@@ -1002,8 +1004,7 @@ public class Controller {
     ArrayList<POI> poisList = new ArrayList<>();
     for (Cache cache : cacheRepository.findAll()) {
       Station station = cache.getStationen().get(0);
-      // ICONS müssen noch erstellt werden und die categoryID entsprechend angepasst
-      POI poi = new POI(cache.getName() + "_Station1", (float) station.getLattitude(), (float) station.getLongitude(), 0);
+      POI poi = new POI(cache.getName() + "_Station1", (float) station.getLattitude(), (float) station.getLongitude(), 202);
       poisList.add(poi);
     }
 
@@ -1014,12 +1015,11 @@ public class Controller {
         int index = cache.getStationen().indexOf(aktuelleStation);
         for (int i = 1; i <= index; i++) {
           Station station = cache.getStationen().get(i);
-          // ICONS müssen noch erstellt werden und die categoryID entsprechend angepasst
           int categoryID;
           if (i < cache.getStationen().size() - 1) { // isnt endstation
-            categoryID = 1;
+            categoryID = 201;
           } else { // is endstation
-            categoryID = 2;
+            categoryID = 203;
           }
           POI poi = new POI(cache.getName() + "_Station" + (i + 1), (float) station.getLattitude(), (float) station.getLongitude(), categoryID);
           poisList.add(poi);
diff --git a/src/main/java/hhn/labsw/bugageocaching/helper/POI.java b/src/main/java/hhn/labsw/bugageocaching/helper/POI.java
index d6a4051..84631ac 100644
--- a/src/main/java/hhn/labsw/bugageocaching/helper/POI.java
+++ b/src/main/java/hhn/labsw/bugageocaching/helper/POI.java
@@ -5,8 +5,7 @@ public class POI {
   private String Name;
   private float Latitude;
   private float Longitude;
-  // ICONS müssen noch erstellt werden und die categoryID entsprechend angepasst
-  private int CategoryID; // 0 = grünes icon(startstation) // 1 = orangenes icon(folgestationen) // 2 = rotes icon(endstation)
+  private int CategoryID; // 202 = grünes icon(startstation) // 201 = blaues icon(folgestationen) // 203 = rotes icon(endstation)
 
   public POI(String name, float latitude, float longitude, int categoryID) {
     Name = name;
diff --git a/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java b/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java
index d8784ec..af74433 100644
--- a/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java
+++ b/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java
@@ -45,7 +45,7 @@ public interface UserRepository extends CrudRepository<User, Integer> {
       "  AND t.id = ui.team_id\n" +
       "  AND ui.team_id IS NOT NULL\n" +
       "GROUP BY teamname\n" +
-      "ORDER by ranking_points_sum DESC" +
+      "ORDER by ranking_points_sum DESC\n" +
       "LIMIT 10;", nativeQuery = true)
   List<Object[]> getTeamRankingList();