Added a setting to always include an empty option in option values