Changed: remove tag pairs with no content and no text consumed
WiP
Merge branch 'master' into NewFilters