Refine of edit results
Locale fix
Locale fix