Hopefully you can get it figured out.
I have pushed this issue with Shopify - I believe they need to fix this somehow on the back end.
I have looked at the product liquid and haven’t yet had the time to see if it could be fixed there. Even if some of the work could be done there, you would still need some java work.