- fix missed break statement and enum check on dupe uuid resolve