Bug fixes

Fixed bug with date disabling