Make spans work better on Beams page.