Improved the detection of the duplicate tracker entries