now with better tag splitting