diff --git a/Sources/src/main/kotlin/allin/data/BetDataSource.kt b/Sources/src/main/kotlin/allin/data/BetDataSource.kt
index 3151783..0cc9966 100644
--- a/Sources/src/main/kotlin/allin/data/BetDataSource.kt
+++ b/Sources/src/main/kotlin/allin/data/BetDataSource.kt
@@ -7,7 +7,7 @@ import java.time.ZonedDateTime
 interface BetDataSource {
     fun getAllBets(filters: List<BetFilter>, userDTO: UserDTO): List<Bet>
     fun getBetById(id: String): Bet?
-    fun getBetDetailById(id: String, username: String): BetDetail?
+    fun getBetDetailById(id: String, userid: String): BetDetail?
     fun getBetsNotFinished(): List<Bet>
     fun addBet(bet: Bet)
     fun removeBet(id: String): Boolean
@@ -15,9 +15,9 @@ interface BetDataSource {
     fun updateBetStatuses(date: ZonedDateTime)
     fun getToConfirm(user: UserDTO): List<BetDetail>
     fun confirmBet(betId: String, result: String)
-    fun getWonNotifications(username: String): List<BetResultDetail>
-    fun getHistory(username: String): List<BetResultDetail>
-    fun getCurrent(username: String): List<BetDetail>
+    fun getWonNotifications(userid: String): List<BetResultDetail>
+    fun getHistory(userid: String): List<BetResultDetail>
+    fun getCurrent(userid: String): List<BetDetail>
     fun getMostPopularBet(): Bet?
     fun updatePopularityScore(betId: String)
     fun addPrivateBet(bet: Bet)
diff --git a/Sources/src/main/kotlin/allin/data/postgres/entities/ParticipationEntity.kt b/Sources/src/main/kotlin/allin/data/postgres/entities/ParticipationEntity.kt
index bc678fc..6fbbe25 100644
--- a/Sources/src/main/kotlin/allin/data/postgres/entities/ParticipationEntity.kt
+++ b/Sources/src/main/kotlin/allin/data/postgres/entities/ParticipationEntity.kt
@@ -5,8 +5,7 @@ import allin.utils.AppConfig
 import org.ktorm.database.Database
 import org.ktorm.dsl.eq
 import org.ktorm.entity.Entity
-import org.ktorm.entity.filter
-import org.ktorm.entity.map
+import org.ktorm.entity.first
 import org.ktorm.entity.sequenceOf
 import org.ktorm.schema.Table
 import org.ktorm.schema.int
@@ -28,7 +27,7 @@ interface ParticipationEntity : Entity<ParticipationEntity> {
             userId = userid,
             answer = answer,
             stake = stake,
-            username = database.users.filter { it.id eq userid }.map { it.username }.first,
+            username = database.users.first { it.id eq userid }.username,
             imageUser = AppConfig.imageManager.getImage(id, database)
         )
 }