replaced numeric character entities and fixed the font/font/block case