fix filter and tracker bugs