FIXED: Improved tag text parsing and cleanup

As per the pull request request :)