More HTML rewrites