Fix problem when option tag values are empty