changed keep_option for empty_option