Changes to templates and cohort selection from single metric page