diff --git a/nymea-app/ui/delegates/ParamDescriptorDelegate.qml b/nymea-app/ui/delegates/ParamDescriptorDelegate.qml
index d43c9a9b..8b34993f 100644
--- a/nymea-app/ui/delegates/ParamDescriptorDelegate.qml
+++ b/nymea-app/ui/delegates/ParamDescriptorDelegate.qml
@@ -59,6 +59,7 @@ ItemDelegate {
                 FontMetrics {
                     id: fm
                 }
+                textRole: "text"
 
                 Layout.fillWidth: true
                 Layout.minimumWidth: {
@@ -86,31 +87,28 @@ ItemDelegate {
                 }
 
                 model: isNumeric ?
-                           [qsTr("is"), qsTr("is not"), qsTr("is greater"), qsTr("is smaller"), qsTr("is greater or equal"), qsTr("is smaller or equal")]
-                         : [qsTr("is"), qsTr("is not")];
+                           numericModel
+                         : nonNumericModel
 
-                onCurrentTextChanged: {
-                    switch (currentText) {
-                    case qsTr("is"):
-                        root.operatorType = ParamDescriptor.ValueOperatorEquals;
-                        break;
-                    case qsTr("is not"):
-                        root.operatorType = ParamDescriptor.ValueOperatorNotEquals;
-                        break;
-                    case qsTr("is greater"):
-                        root.operatorType = ParamDescriptor.ValueOperatorGreater;
-                        break;
-                    case qsTr("is smaller"):
-                        root.operatorType = ParamDescriptor.ValueOperatorLess;
-                        break;
-                    case qsTr("is greater or equal"):
-                        root.operatorType = ParamDescriptor.ValueOperatorGreaterOrEqual;
-                        break;
-                    case qsTr("is smaller or equal"):
-                        root.operatorType = ParamDescriptor.ValueOperatorLessOrEqual;
-                        break;
-                    }
-                    print("set operator to", root.operatorType, currentText)
+                ListModel {
+                    id: numericModel
+                    ListElement { text: qsTr("is equal to"); value: ParamDescriptor.ValueOperatorEquals }
+                    ListElement { text: qsTr("is not equal to"); value: ParamDescriptor.ValueOperatorNotEquals }
+                    ListElement { text: qsTr("is greater than"); value: ParamDescriptor.ValueOperatorGreater }
+                    ListElement { text: qsTr("is less than"); value: ParamDescriptor.ValueOperatorLess }
+                    ListElement { text: qsTr("is greater than or equal to"); value: ParamDescriptor.ValueOperatorGreaterOrEqual }
+                    ListElement { text: qsTr("is less than or equal to"); value: ParamDescriptor.ValueOperatorLessOrEqual }
+                }
+
+                ListModel {
+                    id: nonNumericModel
+                    ListElement { text: qsTr("is"); value: ParamDescriptor.ValueOperatorEquals }
+                    ListElement { text: qsTr("is not "); value: ParamDescriptor.ValueOperatorNotEquals }
+                }
+
+                onCurrentIndexChanged: {
+                    root.operatorType = model.get(currentIndex).value
+                    print("set operator to", root.operatorType, currentText, currentIndex, model, model.get(currentIndex))
                 }
             }
 
@@ -218,7 +216,7 @@ ItemDelegate {
                 }
 
                 Component.onCompleted: {
-                    if (root.value == null || root.v^alue == undefined) {
+                    if (root.value == null || root.value == undefined) {
                         root.value = from;
                     }
                 }
diff --git a/nymea-app/ui/magic/SelectStateDescriptorParamsPage.qml b/nymea-app/ui/magic/SelectStateDescriptorParamsPage.qml
index 74f7f491..706b5899 100644
--- a/nymea-app/ui/magic/SelectStateDescriptorParamsPage.qml
+++ b/nymea-app/ui/magic/SelectStateDescriptorParamsPage.qml
@@ -89,8 +89,27 @@ Page {
                 }
 
                 model: isNumeric ?
-                           [qsTr("is equal to"), qsTr("is not equal to"), qsTr("is smaller than"), qsTr("is greater than"), qsTr("is smaller or equal than"), qsTr("is greater or equal than")]
-                         : [qsTr("is"), qsTr("is not")];
+                           numericModel
+                         : nonNumericModel
+
+                textRole: "text"
+
+                ListModel {
+                    id: numericModel
+                    ListElement { text: qsTr("is equal to"); value: ParamDescriptor.ValueOperatorEquals }
+                    ListElement { text: qsTr("is not equal to"); value: ParamDescriptor.ValueOperatorNotEquals }
+                    ListElement { text: qsTr("is greater than"); value: ParamDescriptor.ValueOperatorGreater }
+                    ListElement { text: qsTr("is less than"); value: ParamDescriptor.ValueOperatorLess }
+                    ListElement { text: qsTr("is greater than or equal to"); value: ParamDescriptor.ValueOperatorGreaterOrEqual }
+                    ListElement { text: qsTr("is less than or equal to"); value: ParamDescriptor.ValueOperatorLessOrEqual }
+                }
+
+                ListModel {
+                    id: nonNumericModel
+                    ListElement { text: qsTr("is"); value: ParamDescriptor.ValueOperatorEquals }
+                    ListElement { text: qsTr("is not "); value: ParamDescriptor.ValueOperatorNotEquals }
+                }
+
             }
 
             GroupBox {
@@ -168,7 +187,8 @@ Page {
                 Layout.margins: app.margins
                 onClicked: {
                     print("saving")
-                    root.stateDescriptor.valueOperator = operatorComboBox.currentIndex
+                    root.stateDescriptor.valueOperator = operatorComboBox.model.get(operatorComboBox.currentIndex).value
+                    print("operator:", root.stateDescriptor.valueOperator)
                     if (staticValueRadioButton.checked) {
                         print("static value:", staticValueParamDelegate.value)
                         root.stateDescriptor.value = staticValueParamDelegate.value