Added track by $index to improve perf