added track by expressions to ng-repeat