Fix (again) issue that blew up memory by not validating close tags
Go back to using String instead of Text