Show all options

Fixes #1505. A second pair of eyes would help.