This is good, but there are other HTML entities that have caused problems afaik, the `@` being one of them. I think this is covered in a separate test, but if it's not, make sure we have that