Improve handling of content from block tags