Great refactor! I was striving to use return to simply that logic, but I got errors when using return in a rule. That would help to simplify the code
I agree, I wouldn’t like to change rules too much, so I can keep track of upstream changes. I would like to keep synchronized with new versions, so 2 option seems to be cleaner. I have already modified the UI, so I could even change the MQTT channel and subscribe to a new one…
Thank you for your insights! I will get back with my final setup.