[tracker] Split tracking & matching process