Improve current track handling