Tweaks to make this stuff actually work.
Merge pull request #3 from methnen/token_store_filter

Tweaks to make this stuff actually work.