Fix searching tags for token

Closes #1