Better support for multiline matching with other tags