Update of getCohortDataInfo and various bug fixes