Revert back to "first pattern wins" strategy
Fix issue-2 token definitions and update samples based on those