Avoid duplication in searches

Searches now do not return duplicated results