Default value wasn't used for fields with empty strings as value