Allow kpi to take alphanumeric tenant id