diff --git a/app/src/main/java/net/pokeranalytics/android/model/filter/Query.kt b/app/src/main/java/net/pokeranalytics/android/model/filter/Query.kt
index bbb8aec4..f4e0106e 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/filter/Query.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/filter/Query.kt
@@ -1,8 +1,7 @@
 package net.pokeranalytics.android.model.filter
 
-import android.content.Context
 import io.realm.RealmQuery
-import net.pokeranalytics.android.R
+import io.realm.kotlin.where
 
 fun List<Query>.mapFirstCondition() : List<QueryCondition> {
 	return this.map { it.conditions.first() }
@@ -67,15 +66,11 @@ class Query {
             }
 		}
 
-        val queryLastGame = this.conditions.filter {
-            it is QueryCondition.LastGame
+        val queryLast = this.conditions.filter {
+            it is QueryCondition.Last
         }.firstOrNull()
-        val queryLastSession = this.conditions.filter {
-            it is QueryCondition.LastSession
-        }.firstOrNull()
-
-        queryLastGame?.let {
-
+        queryLast?.let {
+            return realmQuery.limit((it as QueryCondition.Last).singleValue.toLong())
         }
         return realmQuery
 	}
diff --git a/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt b/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt
index b85d736e..5db0d3ad 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/filter/QueryCondition.kt
@@ -348,7 +348,7 @@ sealed class QueryCondition : FilterElementRow {
         }
     }
 
-    open class TournamentFinalPosition(): ListOfInt() {
+    class TournamentFinalPosition(): ListOfInt() {
         constructor(operator: Operator, finalPosition: Int) : this() {
             this.operator = operator
             this.listOfValues = arrayListOf(finalPosition)