#1127686 by dereine: Allow to use tokens for the arguments again. Additional fix a bunch of tokens for taxonomy/term view