diff --git a/libnymea-app/types/eventtypes.cpp b/libnymea-app/types/eventtypes.cpp
index b5f00af3..3b6f6399 100644
--- a/libnymea-app/types/eventtypes.cpp
+++ b/libnymea-app/types/eventtypes.cpp
@@ -54,7 +54,7 @@ EventType *EventTypes::getEventType(const QUuid &eventTypeId) const
             return eventType;
         }
     }
-    return 0;
+    return nullptr;
 }
 
 int EventTypes::rowCount(const QModelIndex &parent) const
diff --git a/nymea-app/ui/magic/EventDescriptorDelegate.qml b/nymea-app/ui/magic/EventDescriptorDelegate.qml
index 30cef77d..fe05e958 100644
--- a/nymea-app/ui/magic/EventDescriptorDelegate.qml
+++ b/nymea-app/ui/magic/EventDescriptorDelegate.qml
@@ -81,9 +81,9 @@ NymeaSwipeDelegate {
                 operatorString = " ? ";
             }
 
-            var paramType = paramDescriptor.paramTypeId
-                    ? root.eventType.paramTypes.getParamType(paramDescriptor.paramTypeId)
-                    : root.eventType.paramTypes.findByName(paramDescriptor.paramName)
+            var paramType = paramDescriptor.paramName
+                    ? root.eventType.paramTypes.findByName(paramDescriptor.paramName)
+                    : root.eventType.paramTypes.getParamType(paramDescriptor.paramTypeId)
 
             if (i === 0) {
                 // TRANSLATORS: example: "only if temperature > 5"
diff --git a/nymea-app/ui/magic/NewThingMagicPage.qml b/nymea-app/ui/magic/NewThingMagicPage.qml
index e1f7e454..5def81a1 100644
--- a/nymea-app/ui/magic/NewThingMagicPage.qml
+++ b/nymea-app/ui/magic/NewThingMagicPage.qml
@@ -391,6 +391,7 @@ Page {
                 // has the template a value for this? If so, set it, otherwise flag as needsParams
                 print("template:", paramType.id, eventDescriptorTemplate.paramDescriptors.count)
                 if (paramDescriptorTemplate && paramDescriptorTemplate.value !== undefined) {
+                    print("filling in param descriptor:", paramDescriptorTemplate.value)
                     eventDescriptor.paramDescriptors.setParamDescriptorByName(paramDescriptorTemplate.paramName, paramDescriptorTemplate.value, paramDescriptorTemplate.operatorType);
                 } else {
                     needsParams = true;
diff --git a/nymea-app/ui/magic/SelectEventDescriptorParamsPage.qml b/nymea-app/ui/magic/SelectEventDescriptorParamsPage.qml
index 60700cea..aafd58f0 100644
--- a/nymea-app/ui/magic/SelectEventDescriptorParamsPage.qml
+++ b/nymea-app/ui/magic/SelectEventDescriptorParamsPage.qml
@@ -94,6 +94,7 @@ Page {
                 for (var i = 0; i < delegateRepeater.count; i++) {
                     var paramDelegate = delegateRepeater.itemAt(i);
                     if (paramDelegate.considerParam) {
+                        print("adding param descriptor")
                         if (root.device) {
                             root.eventDescriptor.paramDescriptors.setParamDescriptor(paramDelegate.paramType.id, paramDelegate.value, paramDelegate.operatorType)
                         } else if (root.iface) {