Added HTML tag matching and highlighting