Forgot call to check for tokens w/ mutliple tags.
Actually save sorted tags & in correct order.