More HTML rewrites #3