fix queue and tracking ts issue