Closing this one as it appears the only way to fix it is to go back through all of the html in the website. Maybe we'll revisit it at a future date.