added tokens for taxonomy terms