Improvement to HTML tag changes