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 56c68cb7..44d72805 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/Criteria.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/Criteria.kt
@@ -86,7 +86,7 @@ sealed class Criteria(override var uniqueIdentifier: Int) : IntIdentifiable, Row
 
             if (this is ValueCustomFields) {
                 val realm = Realm.getDefaultInstance()
-                val distincts = realm.where<CustomFieldEntry>().equalTo("customField.id", this.customField.id).distinct("value").findAll().sort("value", Sort.ASCENDING)
+                val distincts = realm.where<CustomFieldEntry>().equalTo("customField.id", this.customField.id).distinct("numericValue").findAll().sort("numericValue", Sort.ASCENDING)
                 realm.close()
 
                 val objects = mutableListOf<QueryCondition.CustomFieldNumberQuery>()
@@ -239,6 +239,7 @@ sealed class Criteria(override var uniqueIdentifier: Int) : IntIdentifiable, Row
 				}
 				is Blinds -> comparison<QueryCondition.AnyBlind, String>()
                 is ListCustomFields -> comparison<CustomFieldEntry>()
+                is ValueCustomFields -> comparison<QueryCondition.CustomFieldNumberQuery, Double >()
 				else -> throw PokerAnalyticsException.QueryTypeUnhandled
 			}
 		}