make AOD track selection more flexible