Improve selecting sonar track