Get Cohorts by Cohort Type and By Location

This will add the ability to filter cohorts by a certain cohort type/location, which makes requests faster and enhances backward compatibility with already existing data that didn't have the cohort type column.