Indication of empty choices list
Refactoring toward separation of sources