Refine search tracking, add test.