diff --git a/app/src/main/java/net/pokeranalytics/android/model/Criteria.kt b/app/src/main/java/net/pokeranalytics/android/model/Criteria.kt
index 48c6b3e7..0ac16179 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/Criteria.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/Criteria.kt
@@ -89,7 +89,8 @@ sealed class Criteria {
                 is Blinds -> {
                     val blinds = arrayListOf<QueryCondition.BLIND>()
                     val realm = Realm.getDefaultInstance()
-                    realm.where<Session>().distinct("blinds", "bankroll.currency.code").findAll().sort("cgSmallBlind", Sort.ASCENDING).map {
+                    val query = realm.where<Session>().distinct("blinds").findAll().sort("cgSmallBlind", Sort.ASCENDING)
+                    query.map {
                         it.blinds?.let { stake ->
                             blinds.add(QueryCondition.BLIND().apply {
                                 blind = stake
diff --git a/app/src/main/java/net/pokeranalytics/android/model/comparison/Comparator.kt b/app/src/main/java/net/pokeranalytics/android/model/comparison/Comparator.kt
index 0b3d4b17..6a89abe0 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/comparison/Comparator.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/comparison/Comparator.kt
@@ -55,18 +55,7 @@ enum class Comparator {
 				TOURNAMENT -> listOf(QueryCondition.TOURNAMENT)
                 LIVE -> listOf(QueryCondition.LIVE)
                 ONLINE -> listOf(QueryCondition.ONLINE)
-                BLIND -> {
-                    val blinds = arrayListOf<QueryCondition.BLIND>()
-                    val realm = Realm.getDefaultInstance()
-                    realm.where<Session>().distinct("blinds", "bankroll.currency.code").findAll().sort("cgSmallBlind", Sort.ASCENDING).map {
-                        it.blinds?.let { stake ->
-                            blinds.add(QueryCondition.BLIND().apply { blind = stake
-                                                                        hasDefaultCurrency = it.hasDefaultCurrency })
-                        }
-                    }
-                    realm.close()
-                    blinds
-                }
+                BLIND -> Criteria.Blinds.queryConditions
                 BANKROLL -> Criteria.Bankrolls.queryConditions
                 GAME -> Criteria.Games.queryConditions
                 TOURNAMENT_NAME-> Criteria.TournamentNames.queryConditions
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterCategoryRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterCategoryRow.kt
index 3a4cf3a0..3bdaf4e4 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterCategoryRow.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterCategoryRow.kt
@@ -60,11 +60,8 @@ enum class FilterCategoryRow(override val resId: Int?, override val viewType: In
 				)
 				TOURNAMENT -> arrayListOf(
 					TOURNAMENT_TYPE,
-					COMPLETION_PERCENTAGE,
-					PLACE,
-					PLAYERS_COUNT,
-					TOURNAMENT_RE_BUY_COUNT,
-					BUY_IN
+                    TOURNAMENT_NAME,
+                    TOURNAMENT_FEATURE
 				)
 				ONLINE -> arrayListOf(
 					MULTI_TABLING
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterSectionRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterSectionRow.kt
index 68faf364..ea802476 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterSectionRow.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterSectionRow.kt
@@ -104,18 +104,7 @@ enum class FilterSectionRow(override val resId: Int?) : RowRepresentable {
 						SESSIONS -> arrayListOf(QueryCondition.LAST_GAMES(), QueryCondition.LAST_SESSIONS())
 
 						// Cash
-                        /*
-						BLIND -> {
-							val blinds = arrayListOf<Blind>()
-							val realm = Realm.getDefaultInstance()
-							realm.where<Session>().distinct("blind", "bankroll.currency.code").findAll().sort("cgSmallBlind", Sort.ASCENDING).map {
-                                it.blinds?.let { stake ->
-                                    blinds.add(Blind(stake, it.hasDefaultCurrency))
-                                }
-                            }
-							realm.close()
-                            blinds
-                        }*/
+                        BLIND -> Criteria.Blinds.queryConditions
 						CASH_RE_BUY_COUNT -> arrayListOf(
 							QueryCondition.MAX_RE_BUY(),
 							QueryCondition.MIN_RE_BUY()