This is now fixed per:
Note, it will be about 3-4 weeks till we deploy this ad WD, its a giant change. (rebaked the OP so you can see it in action)