Fix date picker management
Changed subtaskcount management