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 ac87742b..af95c665 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/Criteria.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/Criteria.kt
@@ -97,8 +97,8 @@ sealed class Criteria(override var uniqueIdentifier: Int) : IntIdentifiable, Row
                     it.numericValue
                 }.distinct().forEach {value ->
                     val condition: QueryCondition.CustomFieldNumberQuery = when (this.customFieldType) {
-                        CustomField.Type.AMOUNT.uniqueIdentifier -> QueryCondition.CustomFieldNumberQuery()
-                        CustomField.Type.NUMBER.uniqueIdentifier -> QueryCondition.CustomFieldAmountQuery()
+                        CustomField.Type.AMOUNT.uniqueIdentifier -> QueryCondition.CustomFieldAmountQuery()
+                        CustomField.Type.NUMBER.uniqueIdentifier -> QueryCondition.CustomFieldNumberQuery()
                         else -> throw PokerAnalyticsException.QueryValueMapUnexpectedValue
                     }.apply {
                         this.customFieldId = this@ListCriteria.customFieldId