Adapt to @waferbaby HTML changes