Add start and end context to tags
Fixes headings to be outside blocks.