Updated extra fields rendering to not show fields with empty values.