add track by to fix field focus bug