Are you able to wait a few days until Bubble’s new responsive engine is released (open beta) this week?
I think this may help with this challenge.