Refactors tagged_content_block to include referenced entities