fixed class matching and CSS CDATA builing