diff --git a/src/main/kotlin/de/fraunhofer/iem/dataprovider/kpi/service/KPIService.kt b/src/main/kotlin/de/fraunhofer/iem/dataprovider/kpi/service/KPIService.kt
index 6ca4f6ee1da4d4eef9939967f0ab6226409f2f54..793a9baeee89e5f89cf31925a946a4aba40b6aed 100644
--- a/src/main/kotlin/de/fraunhofer/iem/dataprovider/kpi/service/KPIService.kt
+++ b/src/main/kotlin/de/fraunhofer/iem/dataprovider/kpi/service/KPIService.kt
@@ -36,6 +36,7 @@ class KPIService(
                     displayValue = it.kpi.displayValue,
                     emptyList(),
                     it.kpi.isEmpty,
+                    order = it.kpi.order
                 ),
                 it.weight
             )
@@ -48,7 +49,8 @@ class KPIService(
             isRoot = true,
             displayValue = kpiTreeResponseDto.displayValue,
             children = children,
-            isEmpty = kpiTreeResponseDto.isEmpty
+            isEmpty = kpiTreeResponseDto.isEmpty,
+            order = kpiTreeResponseDto.order
         )
     }
 
diff --git a/src/main/kotlin/de/fraunhofer/iem/dataprovider/repository/controller/RepositoryController.kt b/src/main/kotlin/de/fraunhofer/iem/dataprovider/repository/controller/RepositoryController.kt
index a51198cacc3974e845f9c50f164aae962b555ede..4bcef475fb5bac4c8c4c0ff46cabbeaec9ae47a1 100644
--- a/src/main/kotlin/de/fraunhofer/iem/dataprovider/repository/controller/RepositoryController.kt
+++ b/src/main/kotlin/de/fraunhofer/iem/dataprovider/repository/controller/RepositoryController.kt
@@ -16,7 +16,6 @@ import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.PathVariable
 import org.springframework.web.bind.annotation.RestController
 import org.springframework.web.server.ResponseStatusException
-import java.util.*
 
 @RestController
 class RepositoryController(
@@ -62,9 +61,9 @@ class RepositoryController(
     }
 
     @GetMapping(ApiPaths.SCORE_CARD_BY_REPOSITORY_ID)
-    suspend fun getScoreCardByRepositoryId(@PathVariable id: UUID): ScoreCardResponseDto {
+    suspend fun getScoreCardByRepositoryId(@PathVariable id: Long): ScoreCardResponseDto {
         logger.info("Get repository score card with id $id")
-        val repositoryEntity = this.repositoryService.findRepoByID(id) ?: throw ResponseStatusException(
+        val repositoryEntity = this.repositoryService.findRepoById(id) ?: throw ResponseStatusException(
             HttpStatus.NOT_FOUND, "repository not found"
         )