[WIP] fix track list