Dates fix 2

There are 2 duplicate save methods with the same code, so I made the 2nd one to call the other and moved your code into the 2nd one.
Also if the value is saved as null, will be restored as null too - tested with Calendar type.