Hello @ajio !
After looking into this and reading through the community it sounds like the best solution is the one that you worked through. Here is an example with a similar issue that the poster was able to solve. *Edit: I am going to mark this as a feature request as well.