Fix untargeted search, remove duplicates