Correct index API to include group