[OE-3496] Fixed contacts, and some invalid markup