diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterElementRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterElementRow.kt
index ac49fbc8..3e8b783e 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterElementRow.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/FilterElementRow.kt
@@ -20,25 +20,12 @@ interface FilterElementRow : RowRepresentable {
                     RowRepresentableEditDescriptor(minutes, R.string.minute, inputType = InputType.TYPE_CLASS_NUMBER)
                 )
             }
-            is QueryCondition.SingleInt -> {
+            is QueryCondition.ListOfValues<*> -> {
                 val valueAsString: String? by map
                 arrayListOf(
                     RowRepresentableEditDescriptor(valueAsString, this.resId, inputType = InputType.TYPE_CLASS_NUMBER)
                 )
             }
-            //TODO: Refactor that
-            is QueryCondition.ListOfDouble -> {
-                val amount: String? by map
-                arrayListOf(
-                    RowRepresentableEditDescriptor(amount, R.string.amount, inputType = InputType.TYPE_CLASS_NUMBER)
-                )
-            }
-            is QueryCondition.ListOfInt -> {
-                val amount: String? by map
-                arrayListOf(
-                    RowRepresentableEditDescriptor(amount, R.string.amount, inputType = InputType.TYPE_CLASS_NUMBER)
-                )
-            }
             else -> super.editingDescriptors(map)
         }
     }