Improve implementation of new text block indicator