Fixed bugs with ititialization and setting to null in edit field.
Couldn't test, so may have problems