fix dialog field order