Add in track by and fix the collapse