Date Edit issue resolved