tried to fix a problem with multiple tracks being returned