Card #100 fix for empty options by default