Revert tag parsing so it works with spaces