Fixed selection to use tracking id