Use new regex for tag splitting