Blakeembrey collection select 156

Supersedes https://github.com/walmartlabs/thorax/pull/165 and covers the `expand-tokens` case.