Correcting empty_option behavior - null value should not be overridden