Adding some filter to prevent duplicates