Pulling search tracking until I find a better implementation