Adding track based searching