Find Tracks logic change