[NH TH] change find-by-token to validate-token