Tweak tracking insertion logic