FAIMS-451 - fix the tracker performance