Hi!
I’m pretty sure I have answered your ticket before, I’m afraid it might got lost a few weeks ago (there was a major server issue, I had to roll-back) Very sorry about that, I didn’t notice this reply got deleted as well.
If I remember correctly I had a very similar fix as suggestion, and I have already noted this as a possible change in behavior in a future release, as it completely makes sense.
Thank you for sharing your solution, and again, I’m sorry about the issue.