Move trackBy after filter