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

I'm okay if this misses, but I do want to get the '?' issue fixed ( and since I'm doing this, adding the count )