Fixing display date when null