Use label as value for empty values

This will help in case of the developer don't want to use a short name as value.