Fixed minor bug in block organization in the v2 XML generator