Fix dupe tracks on manual scan

Based on comments in 1504 of master