Better searches tracking (fixes).