Country names
Fix option handling

Make it work even when the output-header option is not specified.

This bug went unnoticed till now, because we always used output-header
before!