Duplicate search fix