Struggling with the same issue, this is very helpful, thanks. Curious if you ever found a “cleaner” method to do this.