Bugfix null instead of empty string for dates