Address HTML sanitizing issues