Tweak HTML mark-up semantics