Fixing issue with empty option values;