Added some additional conditions for determination of save button enable/disable