Handle match on existing sor+sorid (fixes #2)