fix track by issue with annotation tags