Improve selecting sonar track

@IanMayo yes