Some filtering added to the tracker