nexttracks fixes