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

OOIION-1449