OOIION-1449
Make sure that "No Options Available" appears when there really aren't any options available.
Merge pull request #366 from cgalvarino/no_options

OOIION-1449