Added support for Tracks in Manual Search