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 7a4e5961..650ef278 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
@@ -20,10 +20,7 @@ import net.pokeranalytics.android.ui.view.rowrepresentable.FilterElementRow
 import net.pokeranalytics.android.ui.view.rowrepresentable.FilterSectionRow
 import net.pokeranalytics.android.util.NULL_TEXT
 import net.pokeranalytics.android.util.UserDefaults
-import net.pokeranalytics.android.util.extensions.endOfDay
-import net.pokeranalytics.android.util.extensions.hourMinute
-import net.pokeranalytics.android.util.extensions.startOfDay
-import net.pokeranalytics.android.util.extensions.toCurrency
+import net.pokeranalytics.android.util.extensions.*
 import java.text.DateFormatSymbols
 import java.util.*
 import kotlin.collections.ArrayList
@@ -180,7 +177,7 @@ sealed class QueryCondition : FilterElementRow {
             val prefix = this.resId?.let {
                 context.getString(it)+" "
             } ?: ""
-            return prefix+value.toString()
+            return prefix+value.shortDate()
         }
 
         override var listOfValues = ArrayList<Date>()
@@ -354,17 +351,32 @@ sealed class QueryCondition : FilterElementRow {
     object Last: SingleInt() {
         override var operator = Operator.EQUALS
         override fun getDisplayName(context: Context): String {
+            //TODO update string  "last %i"
             return "${context.getString(R.string.last_i_records)} $singleValue"
         }
     }
 
-    class NumberOfTable: ListOfInt()
+    class NumberOfTable: ListOfInt() {
+        override fun labelForValue(value: Int, context: Context): String {
+            val prefix = this.resId?.let {
+                context.getString(it) + " "
+            } ?: ""
+            return prefix + value.toString() + " " + context.getString(R.string.tables)
+        }
+    }
 
     class NumberOfRebuy(): ListOfDouble() {
         constructor(operator: Operator, numberOfRebuy: Double) : this() {
             this.operator = operator
             this.listOfValues = arrayListOf(numberOfRebuy)
         }
+
+        override fun labelForValue(value: Double, context: Context): String {
+            val prefix = this.resId?.let {
+                context.getString(it) + " "
+            } ?: ""
+            return prefix + value.toString()
+        }
     }
 
     class TournamentFinalPosition(): ListOfInt() {
@@ -372,6 +384,13 @@ sealed class QueryCondition : FilterElementRow {
             this.operator = operator
             this.listOfValues = arrayListOf(finalPosition)
         }
+
+        override fun labelForValue(value: Int, context: Context): String {
+            val prefix = this.resId?.let {
+                context.getString(it) + " "
+            } ?: ""
+            return prefix + value.toString()
+        }
     }
 
     open class NetAmount: ListOfDouble()
@@ -379,7 +398,14 @@ sealed class QueryCondition : FilterElementRow {
     class NetAmountWon: NetAmount()
     class NetAmountLost: NetAmount() { override var sign: Int = -1 }
 
-    class TournamentNumberOfPlayer: ListOfInt()
+    class TournamentNumberOfPlayer: ListOfInt() {
+        override fun labelForValue(value: Int, context: Context): String {
+            val prefix = this.resId?.let {
+                context.getString(it) + " "
+            } ?: ""
+            return prefix + value.toString() + context.getString(R.string.number_of_players)
+        }
+    }
 
     class StartedFromDate: DateQuery() { override var operator = Operator.MORE }
     class StartedToDate: DateQuery() { override var operator = Operator.LESS }
@@ -433,6 +459,13 @@ sealed class QueryCondition : FilterElementRow {
     class PastDay: SingleInt() {
         override var operator = Operator.EQUALS
         override val viewType: Int = RowViewType.TITLE_VALUE_CHECK.ordinal
+
+        override fun labelForValue(value: Int, context: Context): String {
+            val suffix = this.resId?.let {
+                " "+context.getString(it)
+            } ?: ""
+            return value.toString() + suffix
+        }
     }
 
     class Duration: SingleInt() {
diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
index 05253c97..33123a35 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
@@ -80,7 +80,7 @@ open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDat
                 AnyTableSize::class.java -> "tableSize"
                 AnyTournamentType::class.java -> "tournamentType"
                 AnyBlind::class.java -> "blinds"
-                NumberOfTable::class.java -> "numberOfTable"
+                NumberOfTable::class.java -> "numberOfTables"
                 NetAmountWon::class.java, NetAmountLost::class.java -> "computableResults.ratedNet"
                 NumberOfRebuy::class.java -> "result.numberOfRebuy"
                 TournamentNumberOfPlayer::class.java -> "result.tournamentNumberOfPlayers"