(Bug 1716) Fix tokens with ?, add count.
Merge pull request #433 from anall/hotfix/Bug1716

(Bug 1716) Fix tokens with ?, add count.