Improve tracker querying