updated queries according to the current cohort definitions