I understood your situation, I will discuss with our dev team to find solution to fix this issue. I will get back to you soon with any updates on this.
Sorry for the late response. I have sent you a store access request, please check and approve so I can take a deeper look at this issue and help you solve.