expand choices by default
Merge pull request #12 from colchambers/wip6609.1

expand choices by default