BISERVER-10341- fix the edit/save and overwrite