Improved parsing of Content in ContentBlock