Fixing date issue
Fixing date issue on other 2 options also