Fixed bug with order of queued tracks and prev-historied tracks