Hello, I tried different options, unfortunately at the moment the automation algorithm 2.0 cannot fulfill your conditions. My recommendations, switch to automation mode 1.0 and recreate your old automation. Fig.
Lesson 1, at the end I made a note 3, how to switch to 1.0.
I will pass this problem to the developers to fix the work.
Sorry for the inconvenience. Automation 2.0. Lesson 1. Introduction