remove the bug with null dates and add the temp fix for the default values being set