Fixed Single Token Search to use Tokens JSON format