Updating cohort searches to match variant refactor. Still some work to do.