Add check for date picker